From 63840743cb4d16fddffcb4090857a28d4fc542d2 Mon Sep 17 00:00:00 2001 From: rapperskull Date: Wed, 4 Oct 2023 00:47:45 +0200 Subject: [PATCH] Fix Release CI Move to 'softprops/action-gh-release@v1' action Update 'actions/checkout' to v4 --- .github/workflows/CI.yml | 156 ++++++--------------------------------- 1 file changed, 23 insertions(+), 133 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ac9ddf0..f3574c0 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -43,7 +43,7 @@ jobs: platform: x64 artifact_os: Win64 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: CMake generate run: | mkdir build && cd build @@ -57,14 +57,14 @@ jobs: mv -vb build\${{ matrix.configuration }}\extract-xiso.exe, LICENSE.TXT artifacts - uses: actions/upload-artifact@v3 with: - name: extract-xiso_${{ matrix.artifact_os }}_${{ matrix.configuration }} + name: extract-xiso-${{ matrix.artifact_os }}-${{ matrix.configuration }} path: artifacts build-linux: runs-on: ubuntu-latest needs: Init steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: CMake generate run: | mkdir build && cd build @@ -78,14 +78,14 @@ jobs: mv -v build/extract-xiso LICENSE.TXT artifacts - uses: actions/upload-artifact@v3 with: - name: extract-xiso_${{ runner.os }} + name: extract-xiso-linux path: artifacts build-macos: runs-on: macos-latest needs: Init steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: CMake generate run: | mkdir build && cd build @@ -99,7 +99,7 @@ jobs: mv -v build/extract-xiso LICENSE.TXT artifacts - uses: actions/upload-artifact@v3 with: - name: extract-xiso_${{ runner.os }} + name: extract-xiso-macos path: artifacts build-freebsd: @@ -108,7 +108,7 @@ jobs: env: SYSROOT_PATH: /opt/cross-freebsd-13 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: FreeBSD toolchain setup run: | sudo apt-get -qq install clang lld && cd /tmp && \ @@ -131,7 +131,7 @@ jobs: mv -v build/extract-xiso LICENSE.TXT artifacts - uses: actions/upload-artifact@v3 with: - name: extract-xiso_freebsd + name: extract-xiso-freebsd path: artifacts build-openbsd: @@ -140,7 +140,7 @@ jobs: env: SYSROOT_PATH: /opt/cross-openbsd-7 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: OpenBSD toolchain setup run: | sudo apt-get -qq install clang lld && cd /tmp && \ @@ -163,7 +163,7 @@ jobs: mv -v build/extract-xiso LICENSE.TXT artifacts - uses: actions/upload-artifact@v3 with: - name: extract-xiso_openbsd + name: extract-xiso-openbsd path: artifacts build-netbsd: @@ -172,7 +172,7 @@ jobs: env: SYSROOT_PATH: /opt/cross-netbsd-9 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: NetBSD toolchain setup run: | sudo apt-get -qq install clang lld && cd /tmp && \ @@ -195,15 +195,13 @@ jobs: mv -v build/extract-xiso LICENSE.TXT artifacts - uses: actions/upload-artifact@v3 with: - name: extract-xiso_netbsd + name: extract-xiso-netbsd path: artifacts Release: if: github.event_name == 'push' && github.ref == 'refs/heads/master' runs-on: ubuntu-latest needs: [build-windows, build-linux, build-macos, build-freebsd, build-openbsd, build-netbsd] - env: - BUILD_TAG: steps: - name: Download artifacts uses: actions/download-artifact@v3 @@ -211,133 +209,25 @@ jobs: path: dist - name: Create archives run: | - pushd dist/extract-xiso_Win32_Release - zip -r ../extract-xiso-win32-release.zip * - popd - pushd dist/extract-xiso_Win32_Debug - zip -r ../extract-xiso-win32-debug.zip * - popd - pushd dist/extract-xiso_Win64_Release - zip -r ../extract-xiso-win64-release.zip * - popd - pushd dist/extract-xiso_Win64_Debug - zip -r ../extract-xiso-win64-debug.zip * - popd - pushd dist/extract-xiso_linux - zip -r ../extract-xiso-linux.zip * - popd - pushd dist/extract-xiso_macOS - zip -r ../extract-xiso-macos.zip * - popd - pushd dist/extract-xiso_freebsd - zip -r ../extract-xiso-freebsd.zip * - popd - pushd dist/extract-xiso_openbsd - zip -r ../extract-xiso-openbsd.zip * - popd - pushd dist/extract-xiso_netbsd - zip -r ../extract-xiso-netbsd.zip * - popd + for dir in dist/extract-xiso-*/ + do + pushd ${dir} + zip_file="../$(basename ${dir} | tr '[:upper:]' '[:lower:]').zip" + echo "Create ${zip_file}" + zip -r ${zip_file} * + popd + done - name: Get package info run: | echo "BUILD_TAG=$(cat dist/tag/tag)" >> $GITHUB_ENV - name: Create release id: create_release - uses: actions/create-release@v1 + uses: softprops/action-gh-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: tag_name: ${{ env.BUILD_TAG }} - release_name: ${{ env.BUILD_TAG }} draft: false prerelease: false - - name: Upload release assets (Win32 build) - id: upload-release-assets-win32-release - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_name: extract-xiso-win32-release.zip - asset_path: dist/extract-xiso-win32-release.zip - asset_content_type: application/zip - - name: Upload release assets (Win32 debug build) - id: upload-release-assets-win32-debug - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_name: extract-xiso-win32-debug.zip - asset_path: dist/extract-xiso-win32-debug.zip - asset_content_type: application/zip - - name: Upload release assets (Win64 build) - id: upload-release-assets-win64-release - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_name: extract-xiso-win64-release.zip - asset_path: dist/extract-xiso-win64-release.zip - asset_content_type: application/zip - - name: Upload release assets (Win64 debug build) - id: upload-release-assets-win64-debug - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_name: extract-xiso-win64-debug.zip - asset_path: dist/extract-xiso-win64-debug.zip - asset_content_type: application/zip - - name: Upload release assets (Linux build) - id: upload-release-assets-linux-release - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_name: extract-xiso-linux.zip - asset_path: dist/extract-xiso-linux.zip - asset_content_type: application/zip - - name: Upload release assets (macOS build) - id: upload-release-assets-macos-release - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_name: extract-xiso-macos.zip - asset_path: dist/extract-xiso-macos.zip - asset_content_type: application/zip - - name: Upload release assets (FreeBSD build) - id: upload-release-assets-freebsd-release - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_name: extract-xiso-freebsd.zip - asset_path: dist/extract-xiso-freebsd.zip - asset_content_type: application/zip - - name: Upload release assets (OpenBSD build) - id: upload-release-assets-openbsd-release - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_name: extract-xiso-openbsd.zip - asset_path: dist/extract-xiso-openbsd.zip - asset_content_type: application/zip - - name: Upload release assets (NetBSD build) - id: upload-release-assets-netbsd-release - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_name: extract-xiso-netbsd.zip - asset_path: dist/extract-xiso-netbsd.zip - asset_content_type: application/zip + fail_on_unmatched_files: true + files: dist/*.zip