From e10846100e928f2b3e683d6add68b03772300db9 Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Sun, 5 Sep 2021 13:03:41 -0700 Subject: [PATCH] .github: Cleanup, fix job name capitalization --- .github/workflows/build.yml | 67 ++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 39 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 624a546eb1..d364fa9f1d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,12 +6,12 @@ jobs: Init: runs-on: ubuntu-latest steps: - - name: Create Build Tag + - name: Create build tag run: | export BUILD_TAG=build-$(date -u +'%Y%m%d%H%M') echo "BUILD_TAG=$BUILD_TAG" >> $GITHUB_ENV echo -n $BUILD_TAG > tag - - name: Upload Artifacts + - name: Upload artifacts uses: actions/upload-artifact@v2 with: name: tag @@ -36,18 +36,18 @@ jobs: env: DOCKER_IMAGE_NAME: mborgerson/xemu-ubuntu-win64-cross:latest steps: - - name: Clone Tree + - name: Clone tree uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Initialize Compiler Cache + - name: Initialize compiler cache id: cache uses: actions/cache@v2 with: path: /tmp/xemu-ccache key: cache-wincross-${{ runner.os }}-${{ matrix.configuration }}-${{ github.sha }} restore-keys: cache-wincross-${{ runner.os }}-${{ matrix.configuration }}- - - name: Pull Docker Image + - name: Pull Docker image run: docker pull $DOCKER_IMAGE_NAME - name: Compile run: | @@ -62,7 +62,7 @@ jobs: bash -c "./build.sh -p win64-cross ${{ matrix.build_param }} && ccache -sc" cd dist zip -r ../${{ matrix.artifact_filename }} * - - name: Upload Build Artifact + - name: Upload build artifact uses: actions/upload-artifact@v2 with: name: ${{ matrix.artifact_name }} @@ -85,11 +85,11 @@ jobs: artifact_name: xemu-ubuntu-release artifact_filename: xemu-ubuntu-release.tgz steps: - - name: Clone Tree + - name: Clone tree uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Install Dependencies + - name: Install dependencies run: | sudo apt-get update sudo apt-get install -y \ @@ -101,7 +101,7 @@ jobs: libpcap-dev \ ccache \ ninja-build - - name: Initialize Compiler Cache + - name: Initialize compiler cache id: cache uses: actions/cache@v2 with: @@ -117,7 +117,7 @@ jobs: echo -e "\nCompiler Cache Stats:" ccache -s -c tar -czvf ${{ matrix.artifact_filename }} --transform "s#^dist#xemu#" dist - - name: Upload Build Artifact + - name: Upload build artifact uses: actions/upload-artifact@v2 with: name: ${{ matrix.artifact_name }} @@ -153,32 +153,21 @@ jobs: artifact_name: xemu-macos-arm64-release artifact_filename: xemu-macos-arm64-release.zip steps: - - name: Clone Tree + - name: Clone tree uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Install Dependencies + - name: Install dependencies run: | export HOMEBREW_NO_AUTO_UPDATE=1 export HOMEBREW_NO_INSTALL_CLEANUP=1 - # brew doctor || true - # brew update-reset - - # # Prevent updated packages from triggering PHP update - # brew uninstall php || true - - # # Force update of Python, handle link issues - # brew uninstall --ignore-dependencies python || true - # brew install python@3.9 || true - # brew link --overwrite python@3.9 || true - brew install \ ccache \ coreutils \ dylibbundler \ pkg-config \ ninja - - name: Initialize Compiler Cache + - name: Initialize compiler cache id: cache # FIXME: actions/cache@v2 broken on macOS? uses: actions/cache@v1 @@ -197,7 +186,7 @@ jobs: pushd dist zip -r ../${{ matrix.artifact_filename }} * popd - - name: Upload Build Artifact + - name: Upload build artifact uses: actions/upload-artifact@v2 with: name: ${{ matrix.artifact_name }} @@ -213,12 +202,12 @@ jobs: env: BUILD_TAG: steps: - - name: Download x86_64 Build + - name: Download x86_64 build uses: actions/download-artifact@v2 with: name: xemu-macos-x86_64-${{ matrix.configuration }} path: xemu-macos-x86_64-${{ matrix.configuration }} - - name: Download arm64 Build + - name: Download arm64 build uses: actions/download-artifact@v2 with: name: xemu-macos-arm64-${{ matrix.configuration }} @@ -241,7 +230,7 @@ jobs: ../xemu-macos-arm64-${{ matrix.configuration }}/xemu.app/Contents/MacOS/xemu zip -r ../xemu-macos-universal-${{ matrix.configuration }}.zip * popd - - name: Upload Build Artifact + - name: Upload build artifact uses: actions/upload-artifact@v2 with: name: xemu-macos-universal-${{ matrix.configuration }} @@ -254,14 +243,14 @@ jobs: env: BUILD_TAG: steps: - - name: Download Artifacts + - name: Download artifacts uses: actions/download-artifact@v2 with: path: dist - - name: Get Package Info + - name: Get package info run: | echo "BUILD_TAG=$(cat dist/tag/tag)" >> $GITHUB_ENV - - name: Create Release + - name: Create release id: create_release uses: actions/create-release@v1 env: @@ -271,7 +260,7 @@ jobs: release_name: ${{ env.BUILD_TAG }} draft: false prerelease: false - - name: Upload Release Assets (Windows Debug Build) + - name: Upload release assets (Windows debug build) id: upload-release-asset-win-debug uses: actions/upload-release-asset@v1.0.1 env: @@ -281,7 +270,7 @@ jobs: asset_name: xemu-win-debug.zip asset_path: dist/xemu-win-debug/xemu-win-debug.zip asset_content_type: application/zip - - name: Upload Release Assets (Windows Release Build) + - name: Upload release assets (Windows release build) id: upload-release-asset-win-release uses: actions/upload-release-asset@v1.0.1 env: @@ -291,7 +280,7 @@ jobs: asset_name: xemu-win-release.zip asset_path: dist/xemu-win-release/xemu-win-release.zip asset_content_type: application/zip - - name: Upload Release Assets (macOS Release Build) + - name: Upload release assets (macOS release build) id: upload-release-asset-macos-release uses: actions/upload-release-asset@v1.0.1 env: @@ -301,7 +290,7 @@ jobs: asset_name: xemu-macos-universal-release.zip asset_path: dist/xemu-macos-universal-release/xemu-macos-universal-release.zip asset_content_type: application/zip - - name: Upload Release Assets (macOS Debug Build) + - name: Upload release assets (macOS debug build) id: upload-release-asset-macos-debug uses: actions/upload-release-asset@v1.0.1 env: @@ -321,18 +310,18 @@ jobs: needs: [Ubuntu, macOSBuildUniversal, UbuntuWinCross] runs-on: ubuntu-latest steps: - - name: Clone Tree + - name: Clone tree uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Create Source Archive + - name: Create source archive run: | ./scripts/archive-source.sh archive.tgz mkdir archive pushd archive tar xf ../archive.tgz popd - - name: Integrate Debian Packaging + - name: Integrate Debian packaging run: | # Clone deb branch containing packaging files git clone --branch=deb --depth=1 https://github.com/mborgerson/xemu.git /tmp/xemu-debian @@ -342,7 +331,7 @@ jobs: echo -e "xemu (1:$(cat archive/XEMU_VERSION)-0) unstable; urgency=medium\n" > archive/debian/changelog echo -e " Built from $(cat archive/XEMU_VERSION)\n" >> archive/debian/changelog echo " -- Matt Borgerson $(date -R)" >> archive/debian/changelog - - name: Deploy Source Archive to Branch + - name: Deploy source archive to branch uses: peaceiris/actions-gh-pages@v3 with: github_token: ${{ secrets.GITHUB_TOKEN }}