fix debian publication

makinacorpus · Nov 19, 2024 · 9b5f892 · 9b5f892
1 parent 3143f42
commit 9b5f892
Showing 1 changed file with 18 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -210,16 +210,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Download 24.04 debian artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: debian-noble
-
-      - name: Download 22.04 debian artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: debian-jammy
-
       - name: Download 20.04 debian artifact
         uses: actions/download-artifact@v4
         with:
@@ -230,13 +220,6 @@ jobs:
         with:
           image: "convertit:latest"
 
-      - name: Attach debian packages as release binaries
-        uses: skx/github-action-publish-binaries@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          args: '*.deb'
-
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -260,6 +243,7 @@ jobs:
         with:
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           known_hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
+
       - name: Publish debian packages
         run: |
           if [[ "${{ github.ref }}" == *"dev"* ]]; then
@@ -270,9 +254,24 @@ jobs:
           echo "${{ github.ref }} : Publishing as $DEB_COMPONENT package"
           scp -P ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no /home/runner/work/convertit/convertit/convertit_*_amd64.deb ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:/srv/packages/incoming/$DEB_COMPONENT/
           if [[ "${{ github.ref }}" == *"dev"* ]]; then
-            ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} make bionic_dev -C /srv/packages
             ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} make focal_dev -C /srv/packages
           else
-            ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} make bionic_main -C /srv/packages
             ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} make focal_main -C /srv/packages
           fi
+
+      - name: Download 24.04 debian artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: debian-noble
+
+      - name: Download 22.04 debian artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: debian-jammy
+
+      - name: Attach debian packages as release binaries
+        uses: skx/github-action-publish-binaries@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: '*.deb'