Rename CI artifacts to job names

radareorg · Feb 18, 2022 · 807e92d · 807e92d
1 parent 14d071d
commit 807e92d
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 82 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -58,12 +58,9 @@ jobs:
     - name: Installing with symlinks
       run: |
         sys/wasi.sh
-    - name: Extract r2 version
-      run: echo "##[set-output name=branch;]$( cd sys;python version.py )"
-      id: r2v
     - uses: actions/upload-artifact@v2
       with:
-        name: radare2-${{ steps.r2v.outputs.branch }}-wasi.zip
+        name: build-wasi
         path: radare2-*-wasi.zip
   build-acr-gperf:
     name: linux-acr-gperf
@@ -200,13 +197,10 @@ jobs:
         # NOLTO=1 sys/static.sh
         make -C binr/blob
         tar cJvf r2-static.tar.xz r2-static
-    - name: Extract r2 version
-      run: echo "##[set-output name=branch;]$( cd sys;python version.py )"
-      id: r2v
     - name: Pub
       uses: actions/upload-artifact@v2
       with:
-        name: radare2-${{ steps.r2v.outputs.branch }}-static.tar.xz
+        name: linux-static
         path: r2-static.tar.xz
     - name: Static r2 build with meson
       run: |
@@ -222,13 +216,10 @@ jobs:
       uses: actions/checkout@v2
     - name: Packaging for Debian
       run: sys/debian.sh
-    - name: Extract r2 version
-      run: echo "##[set-output name=branch;]$( cd sys; python version.py )"
-      id: r2v
     - name: Pub
       uses: actions/upload-artifact@v2
       with:
-        name: radare2_${{ steps.r2v.outputs.branch }}-debian_amd64.zip
+        name: linux-acr-deb-64
         path: dist/debian/*/*.deb
   linux-acr-deb-32:
     runs-on: ubuntu-18.04
@@ -242,13 +233,10 @@ jobs:
         export LDFLAGS=-m32
         export ARCH=i386
         sys/debian.sh
-    - name: Extract r2 version
-      run: echo "##[set-output name=branch;]$( cd sys;python version.py )"
-      id: r2v
     - name: Pub
       uses: actions/upload-artifact@v2
       with:
-        name: radare2_${{ steps.r2v.outputs.branch }}-debian_i386.zip
+        name: linux-acr-deb-32
         path: dist/debian/*/*.deb
 ## RPM PACKAGES DISABLED
 #  linux-meson-rpm:
@@ -267,6 +255,7 @@ jobs:
 #    - name: Pub
 #      uses: actions/upload-artifact@v2
 #      with:
+#        name: linux-meson-rpm
 #        path: RPMS/*/*.rpm *.rpm dist/rpm/*.rpm
 #  centos-meson-rpm:
 #    runs-on: ubuntu:18.04
@@ -295,6 +284,7 @@ jobs:
 #    - name: Pub
 #      uses: actions/upload-artifact@v2
 #      with:
+#        name: centos-meson-rpm
 #        path: rpmbuild/RPMS/*/*.rpm
   linux-asan-fuzz:
     runs-on: ubuntu-20.04
@@ -346,9 +336,6 @@ jobs:
       uses: actions/checkout@v2
     - name: Packaging
       run: dist/macos/build-pkg.sh
-    - name: Extract r2 version
-      run: echo "##[set-output name=branch;]$( python sys/version.py )"
-      id: r2v
 #    - name: Building Radare2
 #      run: |
 #        export CFLAGS="-O2" # -Werror -Wno-unused-result -Wno-unicode -Wno-unneeded-internal-declaration"
@@ -357,22 +344,19 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         path: dist/macos/*.pkg
-        name: radare2-${{ steps.r2v.outputs.branch }}_macos.pkg
+        name: macos-acr
 #   macos-acr-m1:
 #     runs-on: macos-latest
 #     steps:
 #     - name: Checkout
 #       uses: actions/checkout@v2
 #     - name: Packaging
 #       run: export CC="xcrun --sdk macosx11.1 gcc -arch arm64" ; dist/macos/build-pkg.sh
-#     - name: Extract r2 version
-#       run: echo "##[set-output name=branch;]$( python sys/version.py )"
-#       id: r2v
 #     - name: Pub
 #       uses: actions/upload-artifact@v2
 #       with:
 #         path: dist/macos/*.pkg
-#         name: radare2-${{ steps.r2v.outputs.branch }}_macos_m1.pkg
+#         name: macos-acr-m1
   macos-test:
     runs-on: macos-latest
     if: contains(github.ref, 'master') || contains(github.ref, 'ci-')
@@ -398,15 +382,12 @@ jobs:
       run: brew install pkg-config ldid
     - name: Create cydia32 package
       run: ./sys/ios-cydia32.sh
-    - name: Extract r2 version
-      run: echo "##[set-output name=branch;]$( python sys/version.py )"
-      id: r2v
     - name: List sys/cydia
       run: ls -lahR ./dist/cydia
     - uses: actions/upload-artifact@v2
       with:
-        name: radare2-arm32_${{ steps.r2v.outputs.branch }}_iphoneos-arm
-        path: ./dist/cydia/radare2/radare2-arm32_${{ steps.r2v.outputs.branch }}_iphoneos-arm.deb
+        name: ios-cydia32
+        path: ./dist/cydia/radare2/radare2-arm32_*_iphoneos-arm.deb
   ios-cydia:
     if: contains(github.ref, 'master') || contains(github.ref, 'ci-')
     runs-on: macos-latest
@@ -423,17 +404,12 @@ jobs:
         zip -r /tmp/r2ios-sdk.zip *
         popd
         mv /tmp/r2ios-sdk.zip .
-    - name: Extract r2 version
-      run: echo "##[set-output name=branch;]$( python sys/version.py )"
-      id: r2v
     - uses: actions/upload-artifact@v2
       with:
-        name: r2ios_sdk-${{ steps.r2v.outputs.branch }}.zip
-        path: ./r2ios-sdk.zip
-    - uses: actions/upload-artifact@v2
-      with:
-        name: radare2-${{ steps.r2v.outputs.branch }}_iphoneos-arm64.zip
-        path: ./dist/cydia/radare2*/*.deb
+        name: ios-cydia
+        path: |
+          ./r2ios-sdk.zip
+          ./dist/cydia/radare2*/*.deb
 
   android-acr-aarch64:
     if: contains(github.ref, 'master') || contains(github.ref, 'ci-')
@@ -449,12 +425,9 @@ jobs:
         sys/android-ndk-install.sh
         sys/android-build.sh arm64
         ls -l
-    - name: Extract r2 version
-      run: echo "##[set-output name=branch;]$( cd sys;python version.py )"
-      id: r2v
     - uses: actions/upload-artifact@v2
       with:
-        name: radare2-${{ steps.r2v.outputs.branch }}-android-aarch64.tar.gz
+        name: android-acr-aarch64
         path: radare2*android*aarch64.tar.gz
 
   android-acr-arm:
@@ -471,12 +444,9 @@ jobs:
         sys/android-ndk-install.sh 16 arm
         sys/android-build.sh arm
         ls -l
-    - name: Extract r2 version
-      run: echo "##[set-output name=branch;]$( cd sys;python version.py )"
-      id: r2v
     - uses: actions/upload-artifact@v2
       with:
-        name: radare2-${{ steps.r2v.outputs.branch }}-android-arm.tar.gz
+        name: android-acr-arm
         path: radare2*android*arm.tar.gz
 
   android-meson:
@@ -501,10 +471,7 @@ jobs:
         cd /tmp
         rm -rf android-dir/include android-dir/lib
         tar --transform 's/android-dir/data\/data\/org.radareorg.radare2installer/g' -cvf radare2-android-${{ matrix.name }}.tar.gz android-dir/
-    - name: Extract r2 version
-      run: echo "##[set-output name=branch;]$( cd sys;python version.py )"
-      id: r2v
     - uses: actions/upload-artifact@v2
       with:
-        name: radare2-${{ steps.r2v.outputs.branch }}-android-${{ matrix.name }}.tar.gz
+        name: android-meson
         path: /tmp/radare2-android-${{ matrix.name }}.tar.gz
diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
@@ -35,4 +35,5 @@ jobs:
           echo DATE: ; date
     - uses: actions/upload-artifact@v2
       with:
+        name: freebsd
         path: radare2-freebsd.tgz
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,7 +36,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/artifacts/radare2_${{ steps.r2v.outputs.branch }}-debian_amd64.zip/radare2/radare2_${{ steps.r2v.outputs.branch }}_amd64.deb
+          asset_path: dist/artifacts/linux-acr-deb-64/radare2/radare2_${{ steps.r2v.outputs.branch }}_amd64.deb
           asset_name: radare2_${{ steps.r2v.outputs.branch }}_amd64.deb
           asset_content_type: application/vnd.debian.binary-package
       - name: Upload asset for Debian (i386)
@@ -45,7 +45,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/artifacts/radare2_${{ steps.r2v.outputs.branch }}-debian_i386.zip/radare2/radare2_${{ steps.r2v.outputs.branch }}_i386.deb
+          asset_path: dist/artifacts/linux-acr-deb-32/radare2/radare2_${{ steps.r2v.outputs.branch }}_i386.deb
           asset_name: radare2_${{ steps.r2v.outputs.branch }}_i386.deb
           asset_content_type: application/vnd.debian.binary-package
       - name: Upload asset for Windows (w64)
@@ -54,7 +54,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/artifacts/artifact/radare2-${{ steps.r2v.outputs.branch }}-w64.zip
+          asset_path: dist/artifacts/w64-meson/radare2-${{ steps.r2v.outputs.branch }}-w64.zip
           asset_name: radare2-${{ steps.r2v.outputs.branch }}-w64.zip
           asset_content_type: application/zip
       - name: Upload asset for Windows (w32)
@@ -63,7 +63,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/artifacts/radare2-${{ steps.r2v.outputs.branch }}-w32.zip/radare2-${{ steps.r2v.outputs.branch }}-w32.zip
+          asset_path: dist/artifacts/w32-meson/radare2-${{ steps.r2v.outputs.branch }}-w32.zip
           asset_name: radare2-${{ steps.r2v.outputs.branch }}-w32.zip
           asset_content_type: application/zip
       - name: Upload asset for macOS
@@ -72,7 +72,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/artifacts/radare2-${{ steps.r2v.outputs.branch }}_macos.pkg/radare2-${{ steps.r2v.outputs.branch }}.pkg
+          asset_path: dist/artifacts/macos-acr/radare2-${{ steps.r2v.outputs.branch }}.pkg
           asset_name: radare2-${{ steps.r2v.outputs.branch }}.pkg
           asset_content_type: application/x-xar
       - name: Upload asset for iPhoneOS (arm)
@@ -81,7 +81,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/artifacts/radare2-${{ steps.r2v.outputs.branch }}_iphoneos-arm64.zip/radare2/radare2_${{ steps.r2v.outputs.branch }}_iphoneos-arm.deb
+          asset_path: dist/artifacts/ios-cydia/dist/cydia/radare2/radare2_${{ steps.r2v.outputs.branch }}_iphoneos-arm.deb
           asset_name: radare2_${{ steps.r2v.outputs.branch }}_iphoneos-arm.deb
           asset_content_type: application/vnd.debian.binary-package
       - name: Upload asset for iPhoneOS (arm32)
@@ -90,7 +90,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/artifacts/radare2-arm32_${{ steps.r2v.outputs.branch }}_iphoneos-arm/radare2-arm32_${{ steps.r2v.outputs.branch }}_iphoneos-arm.deb
+          asset_path: dist/artifacts/ios-cydia32/radare2-arm32_${{ steps.r2v.outputs.branch }}_iphoneos-arm.deb
           asset_name: radare2-arm32_${{ steps.r2v.outputs.branch }}_iphoneos-arm.deb
           asset_content_type: application/vnd.debian.binary-package
       - name: Upload asset for iOS SDK
@@ -99,7 +99,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/artifacts/r2ios_sdk-${{ steps.r2v.outputs.branch }}.zip/r2ios-sdk.zip
+          asset_path: dist/artifacts/ios-cydia/r2ios-sdk.zip
           asset_name: r2ios-sdk-${{ steps.r2v.outputs.branch }}.zip
           asset_content_type: application/zip
       - name: Upload asset for Android (arm)
@@ -108,7 +108,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/artifacts/radare2-${{ steps.r2v.outputs.branch }}-android-arm.tar.gz/radare2-${{ steps.r2v.outputs.branch }}-android-arm.tar.gz
+          asset_path: dist/artifacts/android-acr-arm/radare2-${{ steps.r2v.outputs.branch }}-android-arm.tar.gz
           asset_name: radare2-${{ steps.r2v.outputs.branch }}-android-arm.tar.gz
           asset_content_type: application/gzip
       - name: Upload asset for Android (x86_64)
@@ -117,7 +117,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/artifacts/radare2-${{ steps.r2v.outputs.branch }}-android-x86_64.tar.gz/radare2-android-x86_64.tar.gz
+          asset_path: dist/artifacts/android-meson/radare2-android-x86_64.tar.gz
           asset_name: radare2-${{ steps.r2v.outputs.branch }}-android-x86_64.tar.gz
           asset_content_type: application/x-tar
       - name: Upload asset for Android (aarch64)
@@ -126,7 +126,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/artifacts/radare2-${{ steps.r2v.outputs.branch }}-android-aarch64.tar.gz/radare2-${{ steps.r2v.outputs.branch }}-android-aarch64.tar.gz
+          asset_path: dist/artifacts/android-acr-aarch64/radare2-${{ steps.r2v.outputs.branch }}-android-aarch64.tar.gz
           asset_name: radare2-${{ steps.r2v.outputs.branch }}-android-aarch64.tar.gz
           asset_content_type: application/gzip
       - name: Upload asset for Linux (static)
@@ -135,7 +135,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/artifacts/radare2-${{ steps.r2v.outputs.branch }}-static.tar.xz/r2-static.tar.xz
+          asset_path: dist/artifacts/linux-static/r2-static.tar.xz
           asset_name: radare2-${{ steps.r2v.outputs.branch }}-static.tar.xz
           asset_content_type: application/x-xz
       - name: Upload asset for Debian dev (amd64)
@@ -144,7 +144,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/artifacts/radare2_${{ steps.r2v.outputs.branch }}-debian_amd64.zip/radare2-dev/radare2-dev_${{ steps.r2v.outputs.branch }}_amd64.deb
+          asset_path: dist/artifacts/linux-acr-deb-64/radare2-dev/radare2-dev_${{ steps.r2v.outputs.branch }}_amd64.deb
           asset_name: radare2-dev_${{ steps.r2v.outputs.branch }}_amd64.deb
           asset_content_type: application/vnd.debian.binary-package
       - name: Upload asset for Debian dev (i386)
@@ -153,7 +153,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/artifacts/radare2_${{ steps.r2v.outputs.branch }}-debian_i386.zip/radare2-dev/radare2-dev_${{ steps.r2v.outputs.branch }}_i386.deb
+          asset_path: dist/artifacts/linux-acr-deb-32/radare2-dev/radare2-dev_${{ steps.r2v.outputs.branch }}_i386.deb
           asset_name: radare2-dev_${{ steps.r2v.outputs.branch }}_i386.deb
           asset_content_type: application/vnd.debian.binary-package
       - name: Upload asset for WASI
@@ -162,7 +162,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/artifacts/radare2-${{ steps.r2v.outputs.branch }}-wasi.zip/radare2-${{ steps.r2v.outputs.branch }}-wasi.zip
+          asset_path: dist/artifacts/build-wasi/radare2-${{ steps.r2v.outputs.branch }}-wasi.zip
           asset_name: radare2-${{ steps.r2v.outputs.branch }}-wasi.zip
           asset_content_type: application/zip
       - name: Upload asset for FreeBSD
@@ -171,6 +171,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: dist/artifacts/artifact/radare2-freebsd.tgz
+          asset_path: dist/artifacts/freebsd/radare2-freebsd.tgz
           asset_name: radare2-${{ steps.r2v.outputs.branch }}-freebsd.tgz
           asset_content_type: application/gzip