diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6e9fb43f9..3b2e6f2f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,13 +34,6 @@ jobs: restore-keys: ${{ runner.os }}-ccache max-size: 1G - - name: 📜 Restore CMakeCache - uses: actions/cache@v3 - with: - path: | - build/CMakeCache.txt - key: ${{ runner.os }}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }} - - name: 🟦 Install msys2 uses: msys2/setup-msys2@v2 with: @@ -61,7 +54,7 @@ jobs: echo "IMHEX_VERSION=`cat VERSION`" >> $GITHUB_ENV # Windows cmake build - - name: 🛠️ Build + - name: 🛠️ Configure CMake run: | set -x mkdir -p build @@ -79,6 +72,10 @@ jobs: -DUSE_SYSTEM_CAPSTONE=ON \ -DDOTNET_EXECUTABLE="C:/Program Files/dotnet/dotnet.exe" \ .. + + - name: 🛠️ Build + run: | + cd build ninja install cpack mv ImHex-*.msi ../imhex-${{env.IMHEX_VERSION}}-Windows-x86_64.msi @@ -150,13 +147,6 @@ jobs: restore-keys: ${{ runner.os }}${{ matrix.suffix }}-ccache max-size: 1G - - name: 📜 Restore CMakeCache - uses: actions/cache@v3 - with: - path: | - build/CMakeCache.txt - key: ${{ runner.os }}-${{ matrix.suffix }}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }} - - name: ⬇️ Install dependencies run: | set -x @@ -203,7 +193,7 @@ jobs: ninja install # MacOS cmake build - - name: 🛠️ Build + - name: 🛠️ Configure CMake run: | set -x mkdir -p build @@ -226,7 +216,9 @@ jobs: -DIMHEX_COMMIT_BRANCH="${GITHUB_REF##*/}" \ -DCPACK_PACKAGE_FILE_NAME="imhex-${{env.IMHEX_VERSION}}-macOS${{matrix.suffix}}-x86_64" \ .. - ninja package + + - name: 🛠️ Build + run: cd build && ninja package - name: ⬆️ Upload DMG uses: actions/upload-artifact@v4 @@ -362,13 +354,6 @@ jobs: restore-keys: Ubuntu-${{matrix.release_num}}-ccache max-size: 1G - - name: 📜 Restore CMakeCache - uses: actions/cache@v3 - with: - path: | - build/CMakeCache.txt - key: Ubuntu-${{matrix.release_num}}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }} - - name: ⬇️ Install dependencies run: | apt update @@ -380,7 +365,7 @@ jobs: dotnet-version: '8.0.100' # Ubuntu cmake build - - name: 🛠️ Build + - name: 🛠️ Configure CMake shell: bash run: | set -x @@ -400,7 +385,9 @@ jobs: -DIMHEX_USE_GTK_FILE_PICKER=ON \ -DDOTNET_EXECUTABLE="dotnet" \ .. - DESTDIR=DebDir ninja install + + - name: 🛠️ Build + run: cd build && DESTDIR=DebDir ninja install - name: 📜 Set version variable run: | @@ -500,15 +487,8 @@ jobs: restore-keys: archlinux-ccache max-size: 1G - - name: 📜 Restore CMakeCache - uses: actions/cache@v3 - with: - path: | - build/CMakeCache.txt - key: archlinux-cmakecache-${{ hashFiles('**/CMakeLists.txt') }} - # ArchLinux cmake build - - name: 🛠️ Build + - name: 🛠️ Configure CMake run: | set -x mkdir -p build @@ -529,7 +509,9 @@ jobs: -DIMHEX_ENABLE_LTO=ON \ -DIMHEX_USE_GTK_FILE_PICKER=ON \ .. - DESTDIR=installDir ninja install + + - name: 🛠️ Build + run: cd build && DESTDIR=installDir ninja install - name: 📜 Set version variable run: |