Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Handling of snapcraft.yaml and rockcraft.yaml in the Same Directory #824

Merged
merged 1 commit into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ runs:
echo "IS_CHANGE=true" >> $GITHUB_ENV
if [ -n "$YAML_PATH" ]; then
mv output_file $YAML_PATH
elif [ -f rockcraft.yaml ]; then
mv output_file rockcraft.yaml
elif [ -d snap ]; then
mv output_file snap/snapcraft.yaml
else
Expand Down
6 changes: 0 additions & 6 deletions updatesnap/updatesnapyaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,6 @@ def get_yaml_file(self, project_url, yaml_path):
data = self._github.get_file(project_url, yaml_path)
except (ValueError, ConnectionError):
data = None
if not data:
yaml_path = 'rockcraft.yaml'
try:
data = self._github.get_file(project_url, yaml_path)
except (ValueError, ConnectionError):
data = None
return data


Expand Down