move pieces around

Notifiarr · Jul 26, 2024 · f83d469 · f83d469
1 parent 53ebe24
commit f83d469
Showing 1 changed file with 22 additions and 19 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -47,12 +47,12 @@ jobs:
           name: dmg-release
           path: release
 
-  release-test:
+  release:
     # description: "Builds all the Notifiarr client binaries and packages for a release."
     if: startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/unstable' || github.ref == 'refs/heads/main'
     outputs:
-      version: ${{ steps.release.outputs.version }}
-      revision: ${{ steps.release.outputs.revision }}
+      version: ${{ steps.vars.outputs.version }}
+      revision: ${{ steps.vars.outputs.revision }}
     name: Make Release Assets
     runs-on: ubuntu-latest
     env:
@@ -66,6 +66,12 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
+      - name: get-vars
+        id: vars
+        run: |
+          source settings.sh
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+          echo "revision=${ITERATION}" >> $GITHUB_OUTPUT
       - name: make-release
         id: release
         run: |
@@ -74,23 +80,20 @@ jobs:
           echo "${GPG_SIGNING_KEY}" | gpg --import -
           [ -z SLIPPERS ] || eval "${SLIPPERS}"
           make release
-          source settings.sh
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
-          echo "revision=${ITERATION}" >> $GITHUB_OUTPUT
-      - name: Upload Release Artifacts
+      - name: Upload Release Artifacts v${{steps.vars.outputs.version}}-${{steps.vars.outputs.revision}}
         uses: actions/upload-artifact@v4
         with:
           name: release
           path: release
 
   print-built-version:
     needs:
-      - release-test
-    name: Built v${{needs.release-test.outputs.version}}-${{needs.release-test.outputs.revision}}
+      - release
+    name: Built v${{needs.release.outputs.version}}-${{needs.release.outputs.revision}}
     runs-on: ubuntu-latest
     steps:
-      - name: Built v${{needs.release-test.outputs.version}}-${{needs.release-test.outputs.revision}}
-        run: echo Built v${{needs.release-test.outputs.version}}-${{needs.release-test.outputs.revision}}
+      - name: Built v${{needs.release.outputs.version}}-${{needs.release.outputs.revision}}
+        run: echo Built v${{needs.release.outputs.version}}-${{needs.release.outputs.revision}}
 
   deploy-unstable-unstable:
     # description: "Uploads pre-built binaries to unstable.golift.io."
@@ -99,7 +102,7 @@ jobs:
       matrix:
         files: [release, dmg-release]
     needs:
-      - release-test
+      - release
       - macapp-test
     name: GoLift Unstable Deploy
     runs-on: ubuntu-latest
@@ -114,15 +117,15 @@ jobs:
             [ -f "$file" ] || continue;
             echo "Uploading: ${file}";
             curl -sSH "X-API-KEY: ${{ secrets.UNSTABLE_UPLOAD_KEY }}" "https://unstable.golift.io/upload.php?folder=notifiarr" -F "file=@${file}";
-            echo '{"version":"${{needs.release-test.outputs.version}}","revision":${{needs.release-test.outputs.revision}},"size":'$(stat --printf="%s" ${file})'}' >> ${file}.txt
+            echo '{"version":"${{needs.release.outputs.version}}","revision":${{needs.release.outputs.revision}},"size":'$(stat --printf="%s" ${file})'}' >> ${file}.txt
             curl -sSH "X-API-KEY: ${{ secrets.UNSTABLE_UPLOAD_KEY }}" "https://unstable.golift.io/upload.php?folder=notifiarr" -F "file=@${file}.txt";
           done
 
   deploy-unstable-packagecloud:
     # description: "Uploads pre-built RPM and DEB packages to packagecloud.io/golift"
     if: github.ref == 'refs/heads/unstable'
     needs:
-      - release-test
+      - release
     name: PackageCloud Unstable Deploy
     runs-on: ubuntu-latest
     steps:
@@ -142,7 +145,7 @@ jobs:
     # description: "Uploads pre-built RPM and DEB packages to packagecloud.io/golift"
     if: startsWith(github.ref, 'refs/tags/v')
     needs:
-      - release-test
+      - release
     name: PackageCloud Release Deploy
     runs-on: ubuntu-latest
     steps:
@@ -158,13 +161,13 @@ jobs:
           rpmdists: el/6
           debdists: ubuntu/focal
 
-  deploy-github-release:
+  deploy-github:
     # description: uploads all the built release assets to the GitHub Release.
     if: startsWith(github.ref, 'refs/tags/v')
     permissions:
       contents: write
     needs:
-      - release-test
+      - release
       - macapp-test
     strategy:
       matrix:
@@ -191,8 +194,8 @@ jobs:
   archlinux-aur:
     # description: creates and uploads and aur file to the golift/aur repo for arch linux.
     needs:
-      - release-test
-      - deploy-github-release
+      - release
+      - deploy-github
     name: Deploy ArchLinux AUR
     runs-on: ubuntu-latest
     steps: