fix newer ubuntu builds

OpenHD · Apr 27, 2024 · 6e96aa8 · 6e96aa8
1 parent fb1aac1
commit 6e96aa8
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 26 deletions.
diff --git a/.github/workflows/build_package_x86_lunar.yml b/.github/workflows/build_package_x86_lunar.yml
@@ -34,6 +34,9 @@ jobs:
         run: |
           ls
           cd QOpenHD
+          apt install -y python3-pip
+          pip install cloudsmith-api --break-system-packages
+          pip install cloudsmith-cli --break-system-packages
           sudo -H ./install_build_dep.sh ubuntu-x86
 
       - name: Build with make
@@ -51,17 +54,23 @@ jobs:
             *.log
           if-no-files-found: error
 
+      # - name: Push
+      #   id: push
+      #   if: ${{ github.ref != 'refs/heads/2.5-evo' }}
+      #   uses: cloudsmith-io/action@master
+      #   with:
+      #     api-key: ${{ secrets.CLOUDSMITH_API_KEY }}
+      #     command: "push"
+      #     format: "deb"
+      #     owner: "openhd"
+      #     repo: ${{ github.ref_name }}
+      #     distro: "ubuntu"
+      #     release: "lunar"
+      #     republish: "true" # needed ONLY if version is not changing
+      #     file: "QOpenHD/*.deb"
+
       - name: Push
-        id: push
-        if: ${{ github.ref != 'refs/heads/2.5-evo' }}
-        uses: cloudsmith-io/action@master
-        with:
-          api-key: ${{ secrets.CLOUDSMITH_API_KEY }}
-          command: "push"
-          format: "deb"
-          owner: "openhd"
-          repo: ${{ github.ref_name }}
-          distro: "ubuntu"
-          release: "lunar"
-          republish: "true" # needed ONLY if version is not changing
-          file: "QOpenHD/*.deb"
+        run: |
+          ls -a
+          cloudsmith push deb  -k ${{ secrets.CLOUDSMITH_API_KEY }} openhd/${{ github.ref_name }}/ubuntu/lunar QOpenHD/*.deb
+
diff --git a/.github/workflows/build_package_x86_noble.yml b/.github/workflows/build_package_x86_noble.yml
@@ -35,6 +35,9 @@ jobs:
         run: |
           ls
           cd QOpenHD
+          apt install -y python3-pip
+          pip install cloudsmith-api --break-system-packages
+          pip install cloudsmith-cli --break-system-packages
           sudo -H ./install_build_dep.sh ubuntu-x86
 
       - name: Build with make
@@ -52,17 +55,22 @@ jobs:
             *.log
           if-no-files-found: error
 
+      # - name: Push
+      #   id: push
+      #   uses: cloudsmith-io/action@master
+      #   with:
+      #     api-key: ${{ secrets.CLOUDSMITH_API_KEY }}
+      #     command: "push"
+      #     format: "deb"
+      #     owner: "openhd"
+      #     repo: ${{ github.ref_name }}
+      #     distro: "ubuntu"
+      #     release: "noble"
+      #     republish: "true" # needed ONLY if version is not changing
+      #     file: "QOpenHD/*.deb"
+      #   if: ${{ github.ref != 'refs/heads/2.5-evo' }}
+
       - name: Push
-        id: push
-        uses: cloudsmith-io/action@master
-        with:
-          api-key: ${{ secrets.CLOUDSMITH_API_KEY }}
-          command: "push"
-          format: "deb"
-          owner: "openhd"
-          repo: ${{ github.ref_name }}
-          distro: "ubuntu"
-          release: "noble"
-          republish: "true" # needed ONLY if version is not changing
-          file: "QOpenHD/*.deb"
-        if: ${{ github.ref != 'refs/heads/2.5-evo' }}
+        run: |
+          ls -a
+          cloudsmith push deb  -k ${{ secrets.CLOUDSMITH_API_KEY }} openhd/${{ github.ref_name }}/ubuntu/noble QOpenHD/*.deb