Merge pull request #1418 from openziti/fix-debian-meta-distro

use generic debian package meta distro "debian"
openziti · Oct 7, 2023 · a3f1b68 · a3f1b68
2 parents 7a6cf89 + 99bd767
commit a3f1b68
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/.github/workflows/publish-linux-packages.yml b/.github/workflows/publish-linux-packages.yml
@@ -93,8 +93,8 @@ jobs:
         shell: bash
         run: >
           jf rt upload
-          ./release/${{ matrix.package_name }}*.${{ matrix.nfpm_packager }}
-          /${{ env.ZITI_RPM_TEST_REPO }}/testing/${{ matrix.arch.rpm }}/
+          ./release/${{ matrix.package_name }}*.rpm
+          /${{ env.ZITI_RPM_TEST_REPO }}/testing/${{ matrix.package_name }}/${{ matrix.arch.rpm }}/
           --recursive=false
           --flat=true 
 
@@ -104,8 +104,8 @@ jobs:
         shell: bash
         run: >
           jf rt upload
-          ./release/${{ matrix.package_name }}*.${{ matrix.nfpm_packager }}
-          /${{ env.ZITI_RPM_PROD_REPO }}/release/${{ matrix.arch.rpm }}/
+          ./release/${{ matrix.package_name }}*.rpm
+          /${{ env.ZITI_RPM_PROD_REPO }}/release/${{ matrix.package_name }}/${{ matrix.arch.rpm }}/
           --recursive=false
           --flat=true 
 
@@ -114,9 +114,9 @@ jobs:
         shell: bash
         run: >
           jf rt upload
-          ./release/${{ matrix.package_name }}*.${{ matrix.nfpm_packager }}
-          /${{ env.ZITI_DEB_TEST_REPO }}/pool/${{ matrix.package_name }}/testing/${{ matrix.arch.deb }}/
-          --deb=testing/main/${{ matrix.arch.deb }}
+          ./release/${{ matrix.package_name }}*.deb
+          /${{ env.ZITI_DEB_TEST_REPO }}/pool/testing/${{ matrix.package_name }}/${{ matrix.arch.deb }}/
+          --deb=debian/main/${{ matrix.arch.deb }}
           --recursive=false
           --flat=true 
 
@@ -126,8 +126,8 @@ jobs:
         shell: bash
         run: >
           jf rt upload
-          ./release/${{ matrix.package_name }}*.${{ matrix.nfpm_packager }}
-          /${{ env.ZITI_DEB_PROD_REPO }}/pool/${{ matrix.package_name }}/release/${{ matrix.arch.deb }}/
-          --deb=release/main/${{ matrix.arch.deb }}
+          ./release/${{ matrix.package_name }}*.deb
+          /${{ env.ZITI_DEB_PROD_REPO }}/pool/release/${{ matrix.package_name }}/${{ matrix.arch.deb }}/
+          --deb=debian/main/${{ matrix.arch.deb }}
           --recursive=false
           --flat=true