wip

biojppm · Jan 16, 2025 · 3ce2991 · 3ce2991
1 parent 9568e18
commit 3ce2991
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 41 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -60,7 +60,7 @@ jobs:
         export SRC_VERSION=$SRC_VERSION
         EOF
     - name: Save vars.sh
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: vars.sh
         path: ./vars.sh
@@ -197,7 +197,7 @@ jobs:
           mv -vf build/$bl/bm/bm-results/* $dst/.
         done
     - name: upload benchmark result artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: ryml-benchmark_results
+        name: ryml-benchmark_results-${{strategy.job-index}}
         path: ryml-benchmark_results/
diff --git a/.github/workflows/benchmarks.ys b/.github/workflows/benchmarks.ys
@@ -72,7 +72,7 @@ jobs:
           mv -vf build/$bl/bm/bm-results/* $dst/.
         done
     - name: upload benchmark result artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: ryml-benchmark_results
+        name: ryml-benchmark_results-${{strategy.job-index}}
         path: ryml-benchmark_results/
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -76,9 +76,9 @@ jobs:
     - name: static64-run
       run: source .github/setenv.sh && c4_build_target static64 ryml-coverage
     - name: static64-coverage-artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: coverage-static64
+        name: coverage-static64-${{strategy.job-index}}
         path: |
           build/static64/lcov
           build/static64/coverage3-final_filtered.lcov
@@ -91,9 +91,9 @@ jobs:
     - name: static32-run
       run: source .github/setenv.sh && c4_build_target static32 ryml-coverage
     - name: static32-coverage-artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: coverage-static32-cxx${{matrix.std}}
+        name: coverage-static32-cxx${{matrix.std}}-${{strategy.job-index}}
         path: |
           build/static32/lcov
           build/static32/coverage3-final_filtered.lcov

diff --git a/.github/workflows/coverage.ys b/.github/workflows/coverage.ys
@@ -40,9 +40,9 @@ jobs:
     - name: static64-run
       run: source .github/setenv.sh && c4_build_target static64 ryml-coverage
     - name: static64-coverage-artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: coverage-static64
+        name: coverage-static64-${{strategy.job-index}}
         path: |
           build/static64/lcov
           build/static64/coverage3-final_filtered.lcov
@@ -61,9 +61,9 @@ jobs:
     - name: static32-run
       run: source .github/setenv.sh && c4_build_target static32 ryml-coverage
     - name: static32-coverage-artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: coverage-static32-cxx${{matrix.std}}
+        name: coverage-static32-cxx${{matrix.std}}-${{strategy.job-index}}
         path: |
           build/static32/lcov
           build/static32/coverage3-final_filtered.lcov

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -67,7 +67,7 @@ jobs:
         export SRC_VERSION=$SRC_VERSION
         EOF
     - name: Save vars.sh
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: vars.sh
         path: ./vars.sh
@@ -144,9 +144,9 @@ jobs:
         python --version
         python tools/amalgamate.py assets/$id.hpp
     - name: Save source artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: assets
+        name: assets-${{strategy.job-index}}
         path: assets
   cpp:
     if: always()
@@ -239,9 +239,9 @@ jobs:
         [ ! -f $asset_src ] && exit 1
         cp -fav $asset_src $asset_dst
     - name: Save artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: assets
+        name: assets-${{strategy.job-index}}
         path: assets
   python_src:
     if: always()
@@ -270,9 +270,9 @@ jobs:
         sdist=`echo $sdist_orig | sed 's:\.zip:-python_src.zip:'`
         mv -fv $sdist_orig $sdist
     - name: Save artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: dist
+        name: dist-${{strategy.job-index}}
         path: dist
   python_wheels:
     if: always()
@@ -382,9 +382,9 @@ jobs:
     - name: rename wheelhouse -> dist
       run: mv -fv wheelhouse dist; ls -lFhp dist/
     - name: Save artifacts for publishing to PyPI
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: dist
+        name: dist-${{strategy.job-index}}
         path: dist
     - name: install python ${{matrix.config.pythonv}}
       uses: actions/setup-python@v5
@@ -428,15 +428,15 @@ jobs:
         submodules: recursive
         fetch-depth: 0
     - name: Gather artifacts - ./assets
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
-        name: assets
-        path: assets
+        pattern: assets-*
+        merge-multiple: true
     - name: Gather artifacts - ./dist
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
-        name: dist
-        path: dist
+        pattern: dist-*
+        merge-multiple: true
     - name: Verify existing artifacts
       run: ls -lFhp assets/ dist/
     - name: Download vars.sh

diff --git a/.github/workflows/release.ys b/.github/workflows/release.ys
@@ -49,8 +49,8 @@ jobs:
     - name: Create source packages
       run:: bash('release-create-source-packages')
     - name: Save source artifacts
-      uses: actions/upload-artifact@v3
-      with: {name: assets, path: assets}
+      uses: actions/upload-artifact@v4
+      with: {name: 'assets-${{strategy.job-index}}', path: assets}
 
   #----------------------------------------------------------------------------
   # create c++ packages
@@ -108,8 +108,8 @@ jobs:
     - name: shared64-normalize
       run:: bash('release-shared-normalize')
     - name: Save artifacts
-      uses: actions/upload-artifact@v3
-      with: {name: assets, path: assets}
+      uses: actions/upload-artifact@v4
+      with: {name: 'assets-${{strategy.job-index}}', path: assets}
 
   #----------------------------------------------------------------------------
   # create python packages
@@ -131,8 +131,8 @@ jobs:
       - name: normalize src package names
         run:: bash('release-normalize')
       - name: Save artifacts
-        uses: actions/upload-artifact@v3
-        with: {name: dist, path: dist}
+        uses: actions/upload-artifact@v4
+        with: {name: 'dist-${{strategy.job-index}}', path: dist}
 
   python_wheels:
     :: setup-job('release' 'python_wheels')
@@ -254,8 +254,8 @@ jobs:
         mv -fv wheelhouse dist;
         ls -lFhp dist/
     - name: Save artifacts for publishing to PyPI
-      uses: actions/upload-artifact@v3
-      with: {name: dist, path: dist}
+      uses: actions/upload-artifact@v4
+      with: {name: 'dist-${{strategy.job-index}}', path: dist}
     # run the tests
     - name: install python ${{matrix.config.pythonv}}
       uses: actions/setup-python@v5
@@ -277,11 +277,11 @@ jobs:
     steps:
     - :: checkout-action
     - name: Gather artifacts - ./assets
-      uses: actions/download-artifact@v3
-      with: {name: assets, path: assets}
+      uses: actions/download-artifact@v4
+      with: {pattern: assets-*, merge-multiple: true}
     - name: Gather artifacts - ./dist
-      uses: actions/download-artifact@v3
-      with: {name: dist, path: dist}
+      uses: actions/download-artifact@v4
+      with: {pattern: dist-*, merge-multiple: true}
     - name: Verify existing artifacts
       run: ls -lFhp assets/ dist/
     # Github

diff --git a/.github/workflows/ys/common.ys b/.github/workflows/ys/common.ys
@@ -182,7 +182,7 @@ version-discover =::
     export SRC_VERSION=$SRC_VERSION
     EOF
 - name: Save vars.sh
-  uses: actions/upload-artifact@v3
+  uses: actions/upload-artifact@v4
   with: {name: vars.sh, path: ./vars.sh}
 - name: Show vars.sh
   run: cat vars.sh