chore(actions-bootstrap): update default actions

manjaro-sway · Jan 24, 2023 · 0188ddb · 0188ddb
1 parent 1fb7c1b
commit 0188ddb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/.github/workflows/pkgbuild.yml b/.github/workflows/pkgbuild.yml
@@ -23,12 +23,13 @@ jobs:
     strategy:
       matrix:
         archlinux_arch: [aarch64, x86_64]
+        branch: [stable, testing, unstable]
         include:
           - archlinux_arch: aarch64
             docker_arch: aarch64
           - archlinux_arch: x86_64
             docker_arch: amd64
-    name: pkgbuild for ${{ matrix.archlinux_arch }}
+    name: pkgbuild for ${{ matrix.archlinux_arch }} - ${{ matrix.branch }}
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
         with:
@@ -39,6 +40,7 @@ jobs:
         uses: Manjaro-Sway/manjaro-package-action@main
         with:
           docker_arch: ${{ matrix.docker_arch }}
+          branch: ${{ matrix.branch }}
           archlinux_arch: ${{ matrix.archlinux_arch }}
           gpg_keyid: ${{ secrets.GPG_KEYID }}
           gpg_signing_key_base64: ${{ secrets.GPG_SECRET_KEY_BASE64 }}

diff --git a/.github/workflows/resubmit.yml b/.github/workflows/resubmit.yml
@@ -28,20 +28,11 @@ jobs:
           echo "file-name-x86_64=$(echo $LATEST_INFO | jq -r '.assets[].name' | grep -m1 -E -i -w '(x86_64|any)')" >>$GITHUB_OUTPUT
           echo "VERSION=$(echo $LATEST_INFO | jq -r '.tag_name')" >> $GITHUB_ENV
       - 
-        name: dispatch_aarch64
-        if: ${{ env.SKIP == 'false' && steps.version.outputs.file-name-aarch64 != '' }}
-        uses: peter-evans/repository-dispatch@26b39ed245ab8f31526069329e112ab2fb224588 # v2
-        with:
-          token: ${{ secrets.DISPATCH }}
-          repository: manjaro-sway/packages
-          event-type: package_update
-          client-payload: '{ "repository": "${{ github.repository }}", "version": "${{ env.VERSION }}", "file_name": "${{ steps.version.outputs.file-name-aarch64 }}"}'
-      - 
-        name: dispatch_x86_64
-        if: ${{ env.SKIP == 'false' && steps.version.outputs.file-name-x86_64 != '' }}
+        name: dispatch
+        if: ${{ env.SKIP == 'false' }}
         uses: peter-evans/repository-dispatch@26b39ed245ab8f31526069329e112ab2fb224588 # v2
         with:
           token: ${{ secrets.DISPATCH }}
           repository: manjaro-sway/packages
           event-type: package_update
-          client-payload: '{ "repository": "${{ github.repository }}", "version": "${{ env.VERSION }}", "file_name": "${{ steps.version.outputs.file-name-x86_64 }}"}'
+          client-payload: '{ "repository": "${{ github.repository }}", "version": "${{ env.VERSION }}" }'