Merge pull request #25 from javacruft/bug/fix-publish-all-rocks-from-…

…branch publish-branch: pass branch to publish-rock
canonical · Dec 12, 2023 · fcd7870 · fcd7870
2 parents 5741a09 + bdee4da
commit fcd7870
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.github/workflows/build_publish.yaml b/.github/workflows/build_publish.yaml
@@ -12,6 +12,10 @@ on:
             description: Publish rocks ?
             default: false
             type: boolean
+        branch:
+            description: Branch to build from
+            required: true
+            default: main
 
 jobs:
   build-and-publish:
@@ -24,6 +28,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.branch }}
       - uses: canonical/craft-actions/rockcraft-pack@main
         id: rockcraft
         with:

diff --git a/.github/workflows/publish_branch.yaml b/.github/workflows/publish_branch.yaml
@@ -51,4 +51,5 @@ jobs:
     uses: ./.github/workflows/build_publish.yaml
     with:
       rocks: ${{ needs.allrocks.outputs.rocks }}
+      branch: ${{ inputs.branch }}
       publish: true