From 24cea2baa4bdbd3bd6a5f9352d36d8022230fdbc Mon Sep 17 00:00:00 2001 From: ConfiG Date: Wed, 2 Aug 2023 18:39:55 +0300 Subject: [PATCH 01/15] please --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e2bc3b44..afad1bae3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,8 +27,9 @@ jobs: os: windows-latest id: win extra_flags: > - -DCMAKE_C_COMPILER=%VCINSTALLDIR%\Tools\Llvm\bin\clang-cl.exe - -DCMAKE_CXX_COMPILER=%VCINSTALLDIR%\Tools\Llvm\bin\clang-cl.exe + --no-warn-unused-cli + "-DCMAKE_C_COMPILER=%VCINSTALLDIR%\Tools\Llvm\bin\clang-cl.exe" + "-DCMAKE_CXX_COMPILER=%VCINSTALLDIR%\Tools\Llvm\bin\clang-cl.exe" -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On cli_cmd: '' package_cmd: 'makensis -WX -V3 ./installer/windows/installer.nsi' From 46c91e805ccc3e8f932985b668f9e2be8b76a868 Mon Sep 17 00:00:00 2001 From: ConfiG Date: Wed, 2 Aug 2023 18:41:57 +0300 Subject: [PATCH 02/15] maybe like that --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index afad1bae3..e7e49fe3e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,8 +28,8 @@ jobs: id: win extra_flags: > --no-warn-unused-cli - "-DCMAKE_C_COMPILER=%VCINSTALLDIR%\Tools\Llvm\bin\clang-cl.exe" - "-DCMAKE_CXX_COMPILER=%VCINSTALLDIR%\Tools\Llvm\bin\clang-cl.exe" + "-DCMAKE_C_COMPILER=$ENV{VCINSTALLDIR}Tools\Llvm\bin\clang-cl.exe" + "-DCMAKE_CXX_COMPILER=$ENV{VCINSTALLDIR}Tools\Llvm\bin\clang-cl.exe" -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On cli_cmd: '' package_cmd: 'makensis -WX -V3 ./installer/windows/installer.nsi' From e4de8f06969b706ef8e50c6ace33a02ddd14bfb0 Mon Sep 17 00:00:00 2001 From: ConfiG Date: Wed, 2 Aug 2023 18:45:40 +0300 Subject: [PATCH 03/15] maybe --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7e49fe3e..604fe81b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,8 +28,8 @@ jobs: id: win extra_flags: > --no-warn-unused-cli - "-DCMAKE_C_COMPILER=$ENV{VCINSTALLDIR}Tools\Llvm\bin\clang-cl.exe" - "-DCMAKE_CXX_COMPILER=$ENV{VCINSTALLDIR}Tools\Llvm\bin\clang-cl.exe" + -DCMAKE_C_COMPILER="$ENV{VCINSTALLDIR}Tools\Llvm\bin\clang-cl.exe" + -DCMAKE_CXX_COMPILER="$ENV{VCINSTALLDIR}Tools\Llvm\bin\clang-cl.exe" -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On cli_cmd: '' package_cmd: 'makensis -WX -V3 ./installer/windows/installer.nsi' From aff823bf2fa096f63db040bde55c4c7b448acb58 Mon Sep 17 00:00:00 2001 From: ConfiG Date: Wed, 2 Aug 2023 18:52:33 +0300 Subject: [PATCH 04/15] kill --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 604fe81b6..fd9d3bd0c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,8 +28,8 @@ jobs: id: win extra_flags: > --no-warn-unused-cli - -DCMAKE_C_COMPILER="$ENV{VCINSTALLDIR}Tools\Llvm\bin\clang-cl.exe" - -DCMAKE_CXX_COMPILER="$ENV{VCINSTALLDIR}Tools\Llvm\bin\clang-cl.exe" + "-DCMAKE_C_COMPILER=$env:VCINSTALLDIR\Tools\Llvm\bin\clang-cl.exe" + "-DCMAKE_CXX_COMPILER=$env:VCINSTALLDIR\Tools\Llvm\bin\clang-cl.exe" -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On cli_cmd: '' package_cmd: 'makensis -WX -V3 ./installer/windows/installer.nsi' From 8909c65cff13b3ea3326866455ec7a2f4ad42940 Mon Sep 17 00:00:00 2001 From: ConfiG Date: Wed, 2 Aug 2023 18:54:57 +0300 Subject: [PATCH 05/15] come on --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fd9d3bd0c..d2645c81a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,8 +28,8 @@ jobs: id: win extra_flags: > --no-warn-unused-cli - "-DCMAKE_C_COMPILER=$env:VCINSTALLDIR\Tools\Llvm\bin\clang-cl.exe" - "-DCMAKE_CXX_COMPILER=$env:VCINSTALLDIR\Tools\Llvm\bin\clang-cl.exe" + "-DCMAKE_C_COMPILER:FILEPATH=$env:VCINSTALLDIR\Tools\Llvm\bin\clang-cl.exe" + "-DCMAKE_CXX_COMPILER:FILEPATH=$env:VCINSTALLDIR\Tools\Llvm\bin\clang-cl.exe" -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On cli_cmd: '' package_cmd: 'makensis -WX -V3 ./installer/windows/installer.nsi' From 7b029d5825ddddf13b700f4733b3b79f94615580 Mon Sep 17 00:00:00 2001 From: ConfiG Date: Wed, 2 Aug 2023 22:13:18 +0300 Subject: [PATCH 06/15] shell: bash --- .github/workflows/build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d2645c81a..e20d82a84 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,8 +28,8 @@ jobs: id: win extra_flags: > --no-warn-unused-cli - "-DCMAKE_C_COMPILER:FILEPATH=$env:VCINSTALLDIR\Tools\Llvm\bin\clang-cl.exe" - "-DCMAKE_CXX_COMPILER:FILEPATH=$env:VCINSTALLDIR\Tools\Llvm\bin\clang-cl.exe" + "-DCMAKE_C_COMPILER:FILEPATH=$VCINSTALLDIR\Tools\Llvm\bin\clang-cl.exe" + "-DCMAKE_CXX_COMPILER:FILEPATH=$VCINSTALLDIR\Tools\Llvm\bin\clang-cl.exe" -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On cli_cmd: '' package_cmd: 'makensis -WX -V3 ./installer/windows/installer.nsi' @@ -79,6 +79,7 @@ jobs: echo "${{ github.workspace }}/cli" >> $GITHUB_PATH - name: Configure CMake + shell: bash run: > cmake -B ${{ github.workspace }}/build -DCLI_PATH="${{ github.workspace }}/cli" @@ -87,6 +88,7 @@ jobs: ${{ matrix.config.extra_flags }} - name: Build + shell: bash run: | cd ${{ github.workspace }}/build cmake --build . --config RelWithDebInfo --parallel From c9ebb890de033dd10efb6abbbf1bf935d2ad3e6f Mon Sep 17 00:00:00 2001 From: ConfiG Date: Wed, 2 Aug 2023 22:17:12 +0300 Subject: [PATCH 07/15] uh --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e20d82a84..4f43d3a6d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,7 +81,7 @@ jobs: - name: Configure CMake shell: bash run: > - cmake -B ${{ github.workspace }}/build + cmake -B build -DCLI_PATH="${{ github.workspace }}/cli" -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache @@ -90,7 +90,7 @@ jobs: - name: Build shell: bash run: | - cd ${{ github.workspace }}/build + cd build cmake --build . --config RelWithDebInfo --parallel - name: Clean Up Resources From 58b2633225aa75b235639536619d45cdd2275478 Mon Sep 17 00:00:00 2001 From: ConfiG Date: Wed, 2 Aug 2023 23:08:11 +0300 Subject: [PATCH 08/15] choco install ccache --- .github/workflows/build.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4f43d3a6d..af45d86dc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,15 +49,22 @@ jobs: runs-on: ${{ matrix.config.os }} steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v3 with: submodules: recursive - - uses: hendrikmuhs/ccache-action@v1 + - name: Install ccache + run: choco install ccache + if: matrix.config.id == 'win' + + - name: Setup ccache + uses: hendrikmuhs/ccache-action@v1 with: key: ${{ matrix.config.os }} - - uses: ilammy/msvc-dev-cmd@v1.12.1 + - name: Setup MSVC + uses: ilammy/msvc-dev-cmd@v1.12.1 with: arch: amd64_x86 if: matrix.config.id == 'win' @@ -79,7 +86,6 @@ jobs: echo "${{ github.workspace }}/cli" >> $GITHUB_PATH - name: Configure CMake - shell: bash run: > cmake -B build -DCLI_PATH="${{ github.workspace }}/cli" @@ -88,7 +94,6 @@ jobs: ${{ matrix.config.extra_flags }} - name: Build - shell: bash run: | cd build cmake --build . --config RelWithDebInfo --parallel @@ -116,7 +121,8 @@ jobs: needs: build if: github.ref == 'refs/heads/main' steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v3 - name: Declare Version Variables id: ref From f110c016343ee90cbe3c4890667c38be11eee8a5 Mon Sep 17 00:00:00 2001 From: ConfiG Date: Wed, 2 Aug 2023 23:11:18 +0300 Subject: [PATCH 09/15] whoopsie --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index af45d86dc..e48482788 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,8 +28,8 @@ jobs: id: win extra_flags: > --no-warn-unused-cli - "-DCMAKE_C_COMPILER:FILEPATH=$VCINSTALLDIR\Tools\Llvm\bin\clang-cl.exe" - "-DCMAKE_CXX_COMPILER:FILEPATH=$VCINSTALLDIR\Tools\Llvm\bin\clang-cl.exe" + "-DCMAKE_C_COMPILER:FILEPATH=$env:VCINSTALLDIR\Tools\Llvm\bin\clang-cl.exe" + "-DCMAKE_CXX_COMPILER:FILEPATH=$env:VCINSTALLDIR\Tools\Llvm\bin\clang-cl.exe" -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On cli_cmd: '' package_cmd: 'makensis -WX -V3 ./installer/windows/installer.nsi' From dde605abdb740f1935e9240f1aa71646f002b33c Mon Sep 17 00:00:00 2001 From: ConfiG Date: Wed, 2 Aug 2023 23:25:13 +0300 Subject: [PATCH 10/15] what if i idk --- .github/workflows/build.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e48482788..a06ab608e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,6 +16,8 @@ on: env: GEODE_CI: '' CCACHE_ACTION_CI: true + CMAKE_C_COMPILER_LAUNCHER: ccache + CMAKE_CXX_COMPILER_LAUNCHER: ccache jobs: build: @@ -86,12 +88,7 @@ jobs: echo "${{ github.workspace }}/cli" >> $GITHUB_PATH - name: Configure CMake - run: > - cmake -B build - -DCLI_PATH="${{ github.workspace }}/cli" - -DCMAKE_C_COMPILER_LAUNCHER=ccache - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - ${{ matrix.config.extra_flags }} + run: cmake -B build -DCLI_PATH="${{ github.workspace }}/cli" ${{ matrix.config.extra_flags }} - name: Build run: | From 1a47c1978ea5aff7dddd4b44b2651e282b2cda16 Mon Sep 17 00:00:00 2001 From: ConfiG Date: Wed, 2 Aug 2023 23:43:49 +0300 Subject: [PATCH 11/15] y u so slow --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a06ab608e..d7eb3d2d7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -93,7 +93,10 @@ jobs: - name: Build run: | cd build - cmake --build . --config RelWithDebInfo --parallel + cmake --build . --config RelWithDebInfo --parallel 14 + + - name: Log ccache Stats + run: ccache -sv - name: Clean Up Resources run: rm ./bin/nightly/resources/.geode_cache From d8ed5b78b90af3c535de174cf313aacceafb2913 Mon Sep 17 00:00:00 2001 From: ConfiG Date: Thu, 3 Aug 2023 00:03:24 +0300 Subject: [PATCH 12/15] i give up --- .github/workflows/build.yml | 13 ++++++------- CMakeLists.txt | 8 -------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d7eb3d2d7..171459ad8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,8 +16,6 @@ on: env: GEODE_CI: '' CCACHE_ACTION_CI: true - CMAKE_C_COMPILER_LAUNCHER: ccache - CMAKE_CXX_COMPILER_LAUNCHER: ccache jobs: build: @@ -28,6 +26,7 @@ jobs: - name: Windows os: windows-latest id: win + #extra_flags: -T host=x64 -A x86 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On extra_flags: > --no-warn-unused-cli "-DCMAKE_C_COMPILER:FILEPATH=$env:VCINSTALLDIR\Tools\Llvm\bin\clang-cl.exe" @@ -42,6 +41,8 @@ jobs: id: mac extra_flags: > -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ + -DCMAKE_C_COMPILER_LAUNCHER=ccache + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 cli_cmd: 'chmod +x $GITHUB_WORKSPACE/cli/geode' package_cmd: './installer/mac/package.sh ./bin/nightly ./installer/mac/geode-installer-mac.pkg' @@ -56,14 +57,11 @@ jobs: with: submodules: recursive - - name: Install ccache - run: choco install ccache - if: matrix.config.id == 'win' - - name: Setup ccache uses: hendrikmuhs/ccache-action@v1 with: key: ${{ matrix.config.os }} + if: matrix.config.id == 'mac' - name: Setup MSVC uses: ilammy/msvc-dev-cmd@v1.12.1 @@ -93,10 +91,11 @@ jobs: - name: Build run: | cd build - cmake --build . --config RelWithDebInfo --parallel 14 + cmake --build . --config RelWithDebInfo --parallel - name: Log ccache Stats run: ccache -sv + if: matrix.config.id == 'mac' - name: Clean Up Resources run: rm ./bin/nightly/resources/.geode_cache diff --git a/CMakeLists.txt b/CMakeLists.txt index 46e2cb186..4efd883c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,14 +44,6 @@ message(STATUS "Version: ${GEODE_VERSION}, tag: ${GEODE_VERSION_TAG} (type: ${GE project(geode-sdk VERSION ${GEODE_VERSION} LANGUAGES CXX C) -# Change debug format to embedded -if (MSVC) - string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}") - string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") - string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}") - string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") -endif() - add_library(${PROJECT_NAME} INTERFACE) if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) From cc824154aeb0b45142a7842711e620fbc8c8a0ce Mon Sep 17 00:00:00 2001 From: ConfiG Date: Thu, 3 Aug 2023 00:13:34 +0300 Subject: [PATCH 13/15] i said i give up --- .github/workflows/build.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 171459ad8..0c3c4a8db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,12 +26,13 @@ jobs: - name: Windows os: windows-latest id: win - #extra_flags: -T host=x64 -A x86 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On - extra_flags: > - --no-warn-unused-cli - "-DCMAKE_C_COMPILER:FILEPATH=$env:VCINSTALLDIR\Tools\Llvm\bin\clang-cl.exe" - "-DCMAKE_CXX_COMPILER:FILEPATH=$env:VCINSTALLDIR\Tools\Llvm\bin\clang-cl.exe" - -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On + extra_flags: -T host=x64 -A x86 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On + # uncomment to use vs clang-cl and ninja + #extra_flags: > + # --no-warn-unused-cli + # "-DCMAKE_C_COMPILER:FILEPATH=$env:VCINSTALLDIR\Tools\Llvm\bin\clang-cl.exe" + # "-DCMAKE_CXX_COMPILER:FILEPATH=$env:VCINSTALLDIR\Tools\Llvm\bin\clang-cl.exe" + # -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On cli_cmd: '' package_cmd: 'makensis -WX -V3 ./installer/windows/installer.nsi' installer_path: './installer/windows/geode-installer-win.exe' @@ -92,14 +93,12 @@ jobs: run: | cd build cmake --build . --config RelWithDebInfo --parallel + rm ./bin/nightly/resources/.geode_cache - name: Log ccache Stats run: ccache -sv if: matrix.config.id == 'mac' - - name: Clean Up Resources - run: rm ./bin/nightly/resources/.geode_cache - - name: Upload Artifacts uses: actions/upload-artifact@v3 with: From 9d489e7eccc7aabe385a0841ae9e3cfbe12ac7bc Mon Sep 17 00:00:00 2001 From: ConfiG Date: Thu, 3 Aug 2023 00:17:05 +0300 Subject: [PATCH 14/15] pleasee --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c3c4a8db..580b2a702 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,12 +86,12 @@ jobs: ${{ matrix.config.cli_cmd }} echo "${{ github.workspace }}/cli" >> $GITHUB_PATH - - name: Configure CMake - run: cmake -B build -DCLI_PATH="${{ github.workspace }}/cli" ${{ matrix.config.extra_flags }} + - name: Configure + run: cmake -B ${{ github.workspace }}/build -DCLI_PATH="${{ github.workspace }}/cli" ${{ matrix.config.extra_flags }} - name: Build run: | - cd build + cd ${{ github.workspace }}/build cmake --build . --config RelWithDebInfo --parallel rm ./bin/nightly/resources/.geode_cache From 6b294d7f02b270d33dfb1efcd9ab8d642ff7378b Mon Sep 17 00:00:00 2001 From: ConfiG Date: Thu, 3 Aug 2023 00:23:54 +0300 Subject: [PATCH 15/15] sdkfjgsaoihrjape --- .github/workflows/build.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 580b2a702..8b5605cd8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: - name: Windows os: windows-latest id: win - extra_flags: -T host=x64 -A x86 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On + extra_flags: -T host=x64 -A win32 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On # uncomment to use vs clang-cl and ninja #extra_flags: > # --no-warn-unused-cli @@ -41,7 +41,8 @@ jobs: os: macos-latest id: mac extra_flags: > - -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ + -DCMAKE_C_COMPILER=clang + -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 @@ -87,17 +88,18 @@ jobs: echo "${{ github.workspace }}/cli" >> $GITHUB_PATH - name: Configure - run: cmake -B ${{ github.workspace }}/build -DCLI_PATH="${{ github.workspace }}/cli" ${{ matrix.config.extra_flags }} + run: > + cmake -B ${{ github.workspace }}/build + -DCLI_PATH="${{ github.workspace }}/cli" + ${{ matrix.config.extra_flags }} - name: Build run: | cd ${{ github.workspace }}/build cmake --build . --config RelWithDebInfo --parallel - rm ./bin/nightly/resources/.geode_cache - - name: Log ccache Stats - run: ccache -sv - if: matrix.config.id == 'mac' + - name: Clean Up Resources + run: rm ./bin/nightly/resources/.geode_cache - name: Upload Artifacts uses: actions/upload-artifact@v3 @@ -187,4 +189,3 @@ jobs: ./geode-${{ steps.ref.outputs.version }}-win.zip ./geode-installer-${{ steps.ref.outputs.version }}-mac.pkg ./geode-installer-${{ steps.ref.outputs.version }}-win.exe -