From 46b95f9b611c00a9f1a55998d78390751a7c1ee8 Mon Sep 17 00:00:00 2001 From: Rudra-IITM Date: Sun, 16 Jun 2024 12:20:50 +0530 Subject: [PATCH 1/2] Extended update-automation for rockcraft.yaml --- action.yml | 13 ++++++++----- updatesnap/updatesnapyaml.py | 6 +++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/action.yml b/action.yml index 32a3441..4c169e8 100644 --- a/action.yml +++ b/action.yml @@ -53,11 +53,14 @@ runs: fi if [ -f output_file ]; then echo "IS_CHANGE=true" >> $GITHUB_ENV - if [ -d snap ]; then - mv output_file snap/snapcraft.yaml - else - mv output_file snapcraft.yaml - fi + if [ -f rockcraft.yaml ]; then + mv output_file rockcraft.yaml + else + if [ -d snap ]; then + mv output_file snap/snapcraft.yaml + else + mv output_file snapcraft.yaml + fi fi env: GITHUB_USER: ubuntu diff --git a/updatesnap/updatesnapyaml.py b/updatesnap/updatesnapyaml.py index 1ada5cd..d4ee469 100755 --- a/updatesnap/updatesnapyaml.py +++ b/updatesnap/updatesnapyaml.py @@ -47,7 +47,11 @@ def get_yaml_file(self, project_url): try: data = self._github.get_file(project_url, yaml_path) except (ValueError, ConnectionError): - data = None + yaml_path = 'rockcraft.yaml' + try: + data = self._github.get_file(project_url, yaml_path) + except (ValueError, ConnectionError): + data = None if not data: yaml_path = 'snap/snapcraft.yaml' try: From d489eacea05693c456cf031fd3a0ec166ce91bf4 Mon Sep 17 00:00:00 2001 From: Rudra-IITM Date: Thu, 20 Jun 2024 16:34:33 +0530 Subject: [PATCH 2/2] correct nested try-catch in updatesnapyaml and correct if-else block in action.yaml --- action.yml | 11 +++++------ updatesnap/updatesnapyaml.py | 6 ++++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/action.yml b/action.yml index 4c169e8..64aa6dc 100644 --- a/action.yml +++ b/action.yml @@ -55,12 +55,11 @@ runs: echo "IS_CHANGE=true" >> $GITHUB_ENV if [ -f rockcraft.yaml ]; then mv output_file rockcraft.yaml - else - if [ -d snap ]; then - mv output_file snap/snapcraft.yaml - else - mv output_file snapcraft.yaml - fi + elif [ -d snap ]; then + mv output_file snap/snapcraft.yaml + else + mv output_file snapcraft.yaml + fi fi env: GITHUB_USER: ubuntu diff --git a/updatesnap/updatesnapyaml.py b/updatesnap/updatesnapyaml.py index d4ee469..755c72d 100755 --- a/updatesnap/updatesnapyaml.py +++ b/updatesnap/updatesnapyaml.py @@ -47,13 +47,15 @@ def get_yaml_file(self, project_url): try: data = self._github.get_file(project_url, yaml_path) except (ValueError, ConnectionError): - yaml_path = 'rockcraft.yaml' + data = None + if not data: + yaml_path = 'snap/snapcraft.yaml' try: data = self._github.get_file(project_url, yaml_path) except (ValueError, ConnectionError): data = None if not data: - yaml_path = 'snap/snapcraft.yaml' + yaml_path = 'rockcraft.yaml' try: data = self._github.get_file(project_url, yaml_path) except (ValueError, ConnectionError):