Merge pull request #1321 from openziti/fix-publish-package-conditionals

fix publish linux package conditionals
openziti · Sep 30, 2023 · ef7b6c4 · ef7b6c4
2 parents 2afe4ad + 685688f
commit ef7b6c4
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/.github/workflows/publish-linux-packages.yml b/.github/workflows/publish-linux-packages.yml
@@ -87,7 +87,7 @@ jobs:
           JF_ENV_1: ${{ secrets.ZITI_ARTIFACTORY_CLI_CONFIG_PACKAGE_UPLOAD }}
 
       - name: Upload RPM to Artifactory testing repo
-        if: ${{ !github.event.release.published && matrix.nfpm_packager == 'rpm' }}
+        if: github.ref == 'refs/heads/release-next' && matrix.nfpm_packager == 'rpm'
         shell: bash
         run: >
           jf rt upload
@@ -97,7 +97,8 @@ jobs:
           --flat=true 
 
       - name: Upload RPM to Artifactory release repo
-        if: ${{ github.event.release.published && matrix.nfpm_packager == 'rpm' }}
+        if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release-v'))
+            && matrix.nfpm_packager == 'rpm'
         shell: bash
         run: >
           jf rt upload
@@ -107,7 +108,7 @@ jobs:
           --flat=true 
 
       - name: Upload DEB to Artifactory testing repo
-        if: ${{ !github.event.release.published && matrix.nfpm_packager == 'deb' }}
+        if: github.ref == 'refs/heads/release-next' && matrix.nfpm_packager == 'deb'
         shell: bash
         run: >
           jf rt upload
@@ -118,7 +119,8 @@ jobs:
           --flat=true 
 
       - name: Upload DEB to Artifactory release repo
-        if: ${{ github.event.release.published && matrix.nfpm_packager == 'deb' }}
+        if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release-v'))
+            && matrix.nfpm_packager == 'deb'
         shell: bash
         run: >
           jf rt upload