Merge branch 'ci/cron_optimization'

lucasssvaz · Jul 1, 2024 · 51de3df · 51de3df
2 parents 25a0bb5 + 4e24823
commit 51de3df
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
@@ -104,6 +104,12 @@ jobs:
         git checkout ${{ env.IDF_BRANCH }} || echo "Using master branch"
         bash ./tools/check-deploy-needed.sh
 
+    - name: Create artifact id
+      id: artifact_id
+      run: |
+        artifact_id=${{ matrix.idf_branch }}-${{ matrix.target }}
+        echo "artifact_id=${artifact_id////_}" >> $GITHUB_ENV
+
     - name: Install dependencies
       #if: env.libs_has_commit == '0' || env.ar_has_commit == '0'
       run: bash ./tools/prepare-ci.sh
@@ -123,14 +129,14 @@ jobs:
       if: failure() && (env.libs_has_commit == '0' || env.ar_has_commit == '0')
       uses: actions/upload-artifact@v4
       with:
-        name: build-${{ matrix.idf_branch }}-${{ matrix.target }}
+        name: build-${{ steps.artifact_id.outputs.artifact_id }}
         path: build
 
     - name: Upload library files
       #if: env.libs_has_commit == '0' || env.ar_has_commit == '0'
       uses: actions/upload-artifact@v4
       with:
-        name: libs-${{ matrix.idf_branch }}-${{ matrix.target }}
+        name: libs-${{ steps.artifact_id.outputs.artifact_id }}
         path: dist
 
   combine-artifacts:
@@ -155,12 +161,18 @@ jobs:
           git checkout ${{ env.IDF_BRANCH }} || echo "Using master branch"
           bash ./tools/check-deploy-needed.sh
 
+      - name: Create artifact id
+        id: artifact_id
+        run: |
+          artifact_id=${{ matrix.idf_branch }}
+          echo "artifact_id=${artifact_id////_}" >> $GITHUB_ENV
+
       - name: Download artifacts
         #if: env.libs_has_commit == '0' || env.ar_has_commit == '0'
         uses: actions/download-artifact@v4
         with:
           path: dist
-          pattern: libs-${{ matrix.idf_branch }}-*
+          pattern: libs-${{ steps.artifact_id.outputs.artifact_id }}-*
           merge-multiple: true
 
       - name: Combine artifacts