Add Argument to Specify YAML File Path

action.yml

@@ -20,6 +20,10 @@ inputs:
     description: 'Version schema of rock repository'
     required: false
     default: 'None'
+  yaml-path:
+    description: 'Path to the YAML file'
+    required: false
+    default: 'snapcraft.yaml'
 
 # Outputs generated by running this action.
 outputs:
@@ -49,7 +53,7 @@ runs:
     - name: run updatesnapyaml
       id: updatesnapyaml
       run: |
-        ./desktop-snaps/updatesnap/updatesnapyaml.py --github-user $GITHUB_USER --github-token $GITHUB_TOKEN --version-schema $VERSION_SCHEMA --rock-version-schema $ROCK_VERSION_SCHEMA https://github.com/${{ github.repository }}
+        ./desktop-snaps/updatesnap/updatesnapyaml.py --github-user $GITHUB_USER --github-token $GITHUB_TOKEN --version-schema $VERSION_SCHEMA --rock-version-schema $ROCK_VERSION_SCHEMA --yaml-path $YAML_PATH https://github.com/${{ github.repository }}
         # Make sure to put the updated snapcraft.yaml file in the right location if it lives in a snap directory
         if [ -f version_file ]; then
           echo "IS_VERSION_CHANGE=true" >> $GITHUB_ENV
@@ -70,6 +74,7 @@ runs:
         GITHUB_TOKEN: ${{ inputs.token }}
         VERSION_SCHEMA: ${{ inputs.version-schema }}
         ROCK_VERSION_SCHEMA: ${{ inputs.rock-version-schema }}
+        YAML_PATH: ${{ inputs.yaml-path }}
       shell: bash
 
 # Step to remove the desktop-snaps folder so that when we commit changes in another repo, the desktop-snaps folder is not committed there.

updatesnap/updatesnapyaml.py

@@ -40,10 +40,9 @@ def get_working_branch(self, project_url):
                 break
         return working_branch
 
-    def get_yaml_file(self, project_url):
+    def get_yaml_file(self, project_url, yaml_path):
         """ Searches in a project for the 'snapcraft.yaml' file and
             returns its contents """
-        yaml_path = 'snapcraft.yaml'
         try:
             data = self._github.get_file(project_url, yaml_path)
         except (ValueError, ConnectionError):
@@ -54,12 +53,6 @@ def get_yaml_file(self, project_url):
                 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
 
 
@@ -76,6 +69,8 @@ def main():
                         help='Version schema of snapping repository')
     parser.add_argument('--rock-version-schema', action='store', default='None',
                         help='Version schema of rock repository')
+    parser.add_argument('--yaml-path', action='store', default='snapcraft.yaml',
+                        help='Path to the yaml file')
     parser.add_argument('--verbose', action='store_true', default=False)
     parser.add_argument('project', default='.', help='The project URI')
     arguments = parser.parse_args(sys.argv[1:])
@@ -88,7 +83,7 @@ def main():
 
     # get the most-updated SNAPCRAFT.YAML file
 
-    data = manager.get_yaml_file(arguments.project)
+    data = manager.get_yaml_file(arguments.project, arguments.yaml_path)
     if not data:
         print('Failed to get the snapcraft.yaml file.', file=sys.stderr)
         sys.exit(-1)