.github: fallback cloudsmith api secret, split job

If slug is not provided, try from secrets directly as a fallback
mechanism. Split jobs to deploy in parallel.

Signed-off-by: Jorge Marques <[email protected]>

Author: gastmaier

.github/workflows/build-package.yml

@@ -1,6 +1,10 @@
 on:
   workflow_call:
     outputs:
+      asset_name:
+        value: ${{ jobs.build.outputs.asset_name}}
+      full_asset_name:
+        value: ${{ jobs.build.outputs.full_asset_name}}
       new_tag:
         value: ${{ jobs.build.outputs.new_tag}}
       tag:
@@ -11,6 +15,8 @@ jobs:
     runs-on: [self-hosted, v1]
 
     outputs:
+      asset_name: ${{ steps.get_new_tag.outputs.asset_name}}
+      full_asset_name: ${{ steps.get_tag.outputs.full_asset_name}}
       new_tag: ${{ steps.get_new_tag.outputs.new_tag}}
       tag: ${{ steps.get_tag.outputs.tag}}
 
@@ -71,6 +77,29 @@ jobs:
         pip3.13 install build
         python3.13 -m build
 
+    - name: Get full asset name
+      run: |
+        echo "asset_name=adi-doctools.tar.gz" >> "$GITHUB_OUTPUT"
+        full_asset_name=$(find dist/ -maxdepth 1 -name "adi_doctools-*.tar.gz" -print -quit)
+        echo "full_asset_name=$full_asset_name" >> "$GITHUB_OUTPUT"
+
+    - name: Get pre-release vars
+      run: |
+        source ./ci/github-api.sh
+        release_id=$(
+          gh-get-release-id ${{ secrets.GITHUB_TOKEN }} \
+                            ${{ github.repository }} \
+                            pre-release \
+                            pre_release_id
+        )
+
+        asset_id=$(
+          gh-get-asset-id ${{ secrets.GITHUB_TOKEN }} \
+                          ${{ github.repository }} \
+                          $release_id \
+                          pre_release_asset_id
+        )
+
     - name: Store the distribution packages
       uses: actions/upload-artifact@v4
       with:

.github/workflows/deploy.yml

@@ -1,8 +1,14 @@
 on:
   workflow_call:
     inputs:
+      asset_name:
+        required: true
+        type: string
+      full_asset_name:
+        required: true
+        type: string
       new_tag:
-        default: false
+        required: true
         type: string
       tag:
         required: true
@@ -13,19 +19,16 @@ permissions:
   id-token: write
 
 jobs:
-  deploy:
+  deploy-github:
     runs-on: [self-hosted, v1]
     permissions:
-      id-token: write
       contents: write
 
     steps:
     - name: Get assets
       run: |
         curl -s -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -L -o github-api.sh \
           https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/ci/github-api.sh
-        curl -s -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -L -o cloudsmith-api.sh \
-          https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/ci/cloudsmith-api.sh
 
     - name: Ensure clean dist
       run: |
@@ -36,14 +39,6 @@ jobs:
         name: dist
         path: dist
 
-    - name: Get others vars
-      run: |
-        asset_name=adi-doctools.tar.gz
-        echo "asset_name=$asset_name" >> "$GITHUB_ENV"
-
-        full_asset_name=$(find dist/ -maxdepth 1 -name "adi_doctools-*.tar.gz" -print -quit)
-        echo "full_asset_name=$full_asset_name" >> "$GITHUB_ENV"
-
     - name: Get pre-release vars
       run: |
         source ./github-api.sh
@@ -98,8 +93,8 @@ jobs:
         gh-upload-asset ${{ secrets.GITHUB_TOKEN }} \
                         ${{ github.repository }} \
                         $release_id \
-                        $asset_name \
-                        $full_asset_name
+                        ${{ inputs.asset_name }} \
+                        ${{ inputs.full_asset_name }}
 
     - name: GitHub update pre-release target commitish
       run: |
@@ -121,8 +116,8 @@ jobs:
         gh-upload-asset ${{ secrets.GITHUB_TOKEN }} \
                         ${{ github.repository }} \
                         $pre_release_id \
-                        $asset_name \
-                        $full_asset_name
+                        ${{ inputs.asset_name }} \
+                        ${{ inputs.full_asset_name }}
 
     - name: GitHub update latest target commitish
       if: ${{ inputs.new_tag == 'true' }}
@@ -146,8 +141,29 @@ jobs:
         gh-upload-asset ${{ secrets.GITHUB_TOKEN }} \
                         ${{ github.repository }} \
                         $latest_id \
-                        $asset_name \
-                        $full_asset_name
+                        ${{ inputs.asset_name }} \
+                        ${{ inputs.full_asset_name }}
+
+  deploy-cloudsmith:
+    runs-on: [self-hosted, v1]
+    permissions:
+      id-token: write
+      contents: write
+
+    steps:
+    - name: Get assets
+      run: |
+        curl -s -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -L -o cloudsmith-api.sh \
+          https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/ci/cloudsmith-api.sh
+
+    - name: Ensure clean dist
+      run: |
+        rm -rf dist
+
+    - uses: actions/download-artifact@v4
+      with:
+        name: dist
+        path: dist
 
     - uses: cloudsmith-io/[email protected]
       env:
@@ -158,6 +174,12 @@ jobs:
         oidc-service-slug: ${{ secrets.CLOUDSMITH_SERVICE_SLUG }}
         oidc-auth-only: 'true'
 
+    - name: Cloudsmith API Key
+      env:
+        CLOUDSMITH_SERVICE_SLUG: ${{ secrets.CLOUDSMITH_SERVICE_SLUG }}
+      if: ${{ env.CLOUDSMITH_SERVICE_SLUG == '' }}
+      run: echo "CLOUDSMITH_API_KEY=${{ secrets.CLOUDSMITH_API_KEY }}" >> "$GITHUB_ENV"
+
     - name: Cloudsmith upload asset and create package
       if: ${{ env.CLOUDSMITH_API_KEY != '' }}
       run: |
@@ -174,11 +196,11 @@ jobs:
         tags_+=", on/${{ github.event_name }}"
 
         package_file=$(
-          cs-upload-package ${{ env.CLOUDSMITH_API_KEY }} \
+          cs-package-upload ${{ env.CLOUDSMITH_API_KEY }} \
                             ${{ vars.CLOUDSMITH_NAMESPACE }} \
                             ${{ vars.CLOUDSMITH_REPOSITORY }} \
-                            $asset_name \
-                            $full_asset_name \
+                            ${{ inputs.asset_name }} \
+                            ${{ inputs.full_asset_name }}
                             latest_package_file
         )
 
@@ -188,6 +210,12 @@ jobs:
                                 $package_file \
                                 $tags_
 
+  deploy-gh-pages:
+    runs-on: [self-hosted, v1]
+    permissions:
+      contents: write
+
+    steps:
     - uses: analogdevicesinc/doctools/blank@action
 
     - name: Prepare gh-pages branch

.github/workflows/top-level.yml

@@ -31,5 +31,7 @@ jobs:
       contents: write
       id-token: write
     with:
+      asset_name: ${{ needs.build-package.outputs.asset_name }}
+      full_asset_name: ${{ needs.build-package.outputs.full_asset_name }}
       new_tag: ${{ needs.build-package.outputs.new_tag }}
       tag: ${{ needs.build-package.outputs.tag }}