Merge pull request #287 from khaledhosny/ci-updates

[ci] Cleanup artifacts upload
khaledhosny · Oct 2, 2024 · 45674eb · 45674eb
2 parents 71a1f82 + 47008cc
commit 45674eb
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,9 +16,9 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: '3.10'
 
@@ -39,7 +39,6 @@ jobs:
       run: ninja -C build test
 
     - name: Install
-      if: github.ref_type == 'tag'
       shell: bash
       run: |
         ninja -C build install
@@ -48,29 +47,27 @@ jobs:
         mv -v dist/bin ots-$VERSION-${{ runner.os }}
 
     - name: Archive
-      if: github.ref_type == 'tag'
       uses: thedoctor0/zip-release@master
       with:
         path: ots-${{ env.ots_version }}-${{ runner.os }}
         filename: ots-${{ env.ots_version }}-${{ runner.os }}.zip
 
     - name: Upload
-      if: github.ref_type == 'tag'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: bin-${{ runner.os }}
+        name: ots-${{ env.ots_version }}-${{ runner.os }}
         path: ots-*.zip
         if-no-files-found: error
 
     - name: Make Dist Tarball
-      if: github.ref_type == 'tag' && matrix.os == 'ubuntu-latest'
+      if: matrix.os == 'ubuntu-latest'
       run: meson dist -C build --no-tests
 
     - name: Upload Dist Tarball
-      if: github.ref_type == 'tag' && matrix.os == 'ubuntu-latest'
-      uses: actions/upload-artifact@v3
+      if: matrix.os == 'ubuntu-latest'
+      uses: actions/upload-artifact@v4
       with:
-        name: dist
+        name: ots-${{ env.ots_version }}
         path: build/meson-dist/ots-*.tar.xz
         if-no-files-found: error
 
@@ -80,10 +77,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Download artifacts from build jobs
-      uses: actions/download-artifact@v4.1.7
+      uses: actions/download-artifact@v4
       with:
         path: dist