From 9eb03af6b0cd8d02362298c44fe92a9da3166eae Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 14 Jun 2025 00:57:27 +0100 Subject: [PATCH] github: don't hardcode github.workplace --- .github/workflows/build.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6765940..c0cc6a7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -184,14 +184,14 @@ jobs: CMAKE_BUILD_TYPE=Release CMAKE_INSTALL_PREFIX=libarchive\builddir ENABLE_OPENSSL=OFF - ZLIB_LIBRARY=C:/a/Bolt/Bolt/libarchive/zlib/builddir/lib/zlibstatic.lib - ZLIB_INCLUDE_DIR=C:/a/Bolt/Bolt/libarchive/zlib/builddir/include - BZIP2_LIBRARIES=C:/a/Bolt/Bolt/libarchive/bzip2/builddir/lib/bz2_static.lib - BZIP2_INCLUDE_DIR=C:/a/Bolt/Bolt/libarchive/bzip2/builddir/include - LIBLZMA_LIBRARY=C:/a/Bolt/Bolt/libarchive/xz/builddir/lib/lzma.lib - LIBLZMA_INCLUDE_DIR=C:/a/Bolt/Bolt/libarchive/xz/builddir/include - ZSTD_LIBRARY=C:/a/Bolt/Bolt/libarchive/zstd/builddir/lib/zstd_static.lib - ZSTD_INCLUDE_DIR=C:/a/Bolt/Bolt/libarchive/zstd/builddir/include + ZLIB_LIBRARY=${{ github.workspace }}/libarchive/zlib/builddir/lib/zlibstatic.lib + ZLIB_INCLUDE_DIR=${{ github.workspace }}/libarchive/zlib/builddir/include + BZIP2_LIBRARIES=${{ github.workspace }}/libarchive/bzip2/builddir/lib/bz2_static.lib + BZIP2_INCLUDE_DIR=${{ github.workspace }}/libarchive/bzip2/builddir/include + LIBLZMA_LIBRARY=${{ github.workspace }}/libarchive/xz/builddir/lib/lzma.lib + LIBLZMA_INCLUDE_DIR=${{ github.workspace }}/libarchive/xz/builddir/include + ZSTD_LIBRARY=${{ github.workspace }}/libarchive/zstd/builddir/lib/zstd_static.lib + ZSTD_INCLUDE_DIR=${{ github.workspace }}/libarchive/zstd/builddir/include build-args: --config Release -j ${{ env.NUMBER_OF_PROCESSORS }} - name: Create libarchive release @@ -246,10 +246,10 @@ jobs: build-dir: build # Makes it so that the build directory is set to Bolt/build generator: Visual Studio 17 options: | - BOLT_LIBARCHIVE_DIR=C:\a\Bolt\Bolt\libarchive\builddir - BOLT_LUAJIT_DIR=C:\a\Bolt\Bolt\LuaJIT\src + BOLT_LIBARCHIVE_DIR=${{ github.workspace }}\libarchive\builddir + BOLT_LUAJIT_DIR=${{ github.workspace }}\LuaJIT\src CMAKE_BUILD_TYPE=Release - BOLT_CEF_INSTALLDIR=C:\a\Bolt\Bolt\install-location + BOLT_CEF_INSTALLDIR=${{ github.workspace }}\install-location build-args: --config Release -j ${{ env.NUMBER_OF_PROCESSORS }} # Installs to C:\a\Bolt\Bolt\install-location\bolt-launcher\* @@ -262,7 +262,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: Bolt-Windows-${{ github.sha }} - path: C:\a\Bolt\Bolt\install-location + path: ${{ github.workspace }}\install-location # Uploads the zip file to the release matching the format of the above step # Such that build artifacts and release artifacts are the same @@ -273,8 +273,8 @@ jobs: # In the script below we cd in to Bolt first, because otherwise the gh command will fail. run: | cd Bolt - Compress-Archive -Path C:\a\Bolt\Bolt\install-location\bolt-launcher -DestinationPath C:\a\Bolt\Bolt\Bolt-Windows.zip - gh release upload ${{ github.event.release.tag_name }} C:\a\Bolt\Bolt\Bolt-Windows.zip + Compress-Archive -Path ${{ github.workspace }}\install-location\bolt-launcher -DestinationPath ${{ github.workspace }}\Bolt-Windows.zip + gh release upload ${{ github.event.release.tag_name }} ${{ github.workspace }}\Bolt-Windows.zip build-linux-project: name: Build Linux