From 62d37f52cb691b4f0827327a1d8d72bef01a010c Mon Sep 17 00:00:00 2001 From: qimiko <25387744+qimiko@users.noreply.github.com> Date: Thu, 27 Jun 2024 06:34:00 -0700 Subject: [PATCH 01/58] ! --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 68834ca3..3a5c8d23 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -180,12 +180,17 @@ jobs: -DCMAKE_AR='/usr/bin/ar' -DCMAKE_RANLIB='/usr/bin/ranlib' -DGEODE_DISABLE_PRECOMPILED_HEADERS=Off + -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" ${{ steps.build-debug-info.outputs.extra-configure }} + env: + MACOSX_DEPLOYMENT_TARGET: "10.15" - name: Build run: | ${{ env.base-build-command }} ${{ steps.build-debug-info.outputs.extra-build }} + env: + MACOSX_DEPLOYMENT_TARGET: "10.15" - name: Upload Artifacts uses: actions/upload-artifact@v4 From 65d0528729d6dd9fa38210928c061f5477bb082e Mon Sep 17 00:00:00 2001 From: qimiko <25387744+qimiko@users.noreply.github.com> Date: Thu, 27 Jun 2024 06:41:33 -0700 Subject: [PATCH 02/58] have to see --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3a5c8d23..8a93b043 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -163,10 +163,10 @@ jobs: with: host: mac - - name: Install LLVM - run: | - brew install llvm - echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH + # - name: Install LLVM + # run: | + # brew install llvm + # echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main From 6117ab36b38d1bc357c626500098956b8f4110ac Mon Sep 17 00:00:00 2001 From: qimiko <25387744+qimiko@users.noreply.github.com> Date: Thu, 27 Jun 2024 07:03:44 -0700 Subject: [PATCH 03/58] it was exactly as i remembered it --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a93b043..cd0a10a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ on: use-ccache: description: 'Enable ccache/sccache' required: false - default: true + default: false type: boolean pull_request: push: @@ -163,10 +163,10 @@ jobs: with: host: mac - # - name: Install LLVM - # run: | - # brew install llvm - # echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH + - name: Install LLVM + run: | + brew install llvm + echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main From 2eca9dea9b4e21eb2538d88f89985cd7fa576c1b Mon Sep 17 00:00:00 2001 From: ConfiG Date: Thu, 27 Jun 2024 22:40:40 +0300 Subject: [PATCH 04/58] lets try the ldflags and cppflags --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cd0a10a9..afafdc0f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -184,6 +184,8 @@ jobs: ${{ steps.build-debug-info.outputs.extra-configure }} env: MACOSX_DEPLOYMENT_TARGET: "10.15" + LDFLAGS: -L/opt/homebrew/opt/llvm/lib -L/opt/homebrew/opt/llvm/lib/c++ -Wl,-rpath,/opt/homebrew/opt/llvm/lib/c++ + CPPFLAGS: -I/opt/homebrew/opt/llvm/include - name: Build run: | @@ -191,6 +193,8 @@ jobs: ${{ steps.build-debug-info.outputs.extra-build }} env: MACOSX_DEPLOYMENT_TARGET: "10.15" + LDFLAGS: -L/opt/homebrew/opt/llvm/lib -L/opt/homebrew/opt/llvm/lib/c++ -Wl,-rpath,/opt/homebrew/opt/llvm/lib/c++ + CPPFLAGS: -I/opt/homebrew/opt/llvm/include - name: Upload Artifacts uses: actions/upload-artifact@v4 From 41ecd8e8922cc93054a2f20d111be65705a91de6 Mon Sep 17 00:00:00 2001 From: qimiko <25387744+qimiko@users.noreply.github.com> Date: Thu, 27 Jun 2024 16:05:50 -0700 Subject: [PATCH 05/58] take 2 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index afafdc0f..1a688bbb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -180,7 +180,7 @@ jobs: -DCMAKE_AR='/usr/bin/ar' -DCMAKE_RANLIB='/usr/bin/ranlib' -DGEODE_DISABLE_PRECOMPILED_HEADERS=Off - -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" + -DCMAKE_OSX_ARCHITECTURES="arm64" ${{ steps.build-debug-info.outputs.extra-configure }} env: MACOSX_DEPLOYMENT_TARGET: "10.15" From 36af716e3660bd8252ce50dd9780db516f754311 Mon Sep 17 00:00:00 2001 From: qimiko <25387744+qimiko@users.noreply.github.com> Date: Thu, 27 Jun 2024 16:40:36 -0700 Subject: [PATCH 06/58] undo that --- .github/workflows/build.yml | 8 ++------ cmake/Platform.cmake | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1a688bbb..a6463bc0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -176,16 +176,14 @@ jobs: ${{ env.base-configure-command }} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ - -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 + -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" -DCMAKE_AR='/usr/bin/ar' -DCMAKE_RANLIB='/usr/bin/ranlib' -DGEODE_DISABLE_PRECOMPILED_HEADERS=Off - -DCMAKE_OSX_ARCHITECTURES="arm64" + -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" ${{ steps.build-debug-info.outputs.extra-configure }} env: MACOSX_DEPLOYMENT_TARGET: "10.15" - LDFLAGS: -L/opt/homebrew/opt/llvm/lib -L/opt/homebrew/opt/llvm/lib/c++ -Wl,-rpath,/opt/homebrew/opt/llvm/lib/c++ - CPPFLAGS: -I/opt/homebrew/opt/llvm/include - name: Build run: | @@ -193,8 +191,6 @@ jobs: ${{ steps.build-debug-info.outputs.extra-build }} env: MACOSX_DEPLOYMENT_TARGET: "10.15" - LDFLAGS: -L/opt/homebrew/opt/llvm/lib -L/opt/homebrew/opt/llvm/lib/c++ -Wl,-rpath,/opt/homebrew/opt/llvm/lib/c++ - CPPFLAGS: -I/opt/homebrew/opt/llvm/include - name: Upload Artifacts uses: actions/upload-artifact@v4 diff --git a/cmake/Platform.cmake b/cmake/Platform.cmake index a1fd167a..e4eb18f8 100644 --- a/cmake/Platform.cmake +++ b/cmake/Platform.cmake @@ -25,7 +25,7 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "MacOS") endif() # only exists as a global property - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15) + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15") target_link_libraries(${PROJECT_NAME} INTERFACE "-framework Cocoa" From 5b523aa2e1cf0dec226a0f190326210deb685037 Mon Sep 17 00:00:00 2001 From: qimiko <25387744+qimiko@users.noreply.github.com> Date: Thu, 27 Jun 2024 17:52:07 -0700 Subject: [PATCH 07/58] go error --- .github/workflows/build.yml | 6 +++--- cmake/Platform.cmake | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a6463bc0..7339959f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -176,21 +176,21 @@ jobs: ${{ env.base-configure-command }} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ - -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" + -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" -DCMAKE_AR='/usr/bin/ar' -DCMAKE_RANLIB='/usr/bin/ranlib' -DGEODE_DISABLE_PRECOMPILED_HEADERS=Off -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" ${{ steps.build-debug-info.outputs.extra-configure }} env: - MACOSX_DEPLOYMENT_TARGET: "10.15" + MACOSX_DEPLOYMENT_TARGET: "10.13" - name: Build run: | ${{ env.base-build-command }} ${{ steps.build-debug-info.outputs.extra-build }} env: - MACOSX_DEPLOYMENT_TARGET: "10.15" + MACOSX_DEPLOYMENT_TARGET: "10.13" - name: Upload Artifacts uses: actions/upload-artifact@v4 diff --git a/cmake/Platform.cmake b/cmake/Platform.cmake index e4eb18f8..d0258a33 100644 --- a/cmake/Platform.cmake +++ b/cmake/Platform.cmake @@ -25,7 +25,7 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "MacOS") endif() # only exists as a global property - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15") + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13") target_link_libraries(${PROJECT_NAME} INTERFACE "-framework Cocoa" From 05ab42c9b6a243bb3cec8f830fa0943de4085897 Mon Sep 17 00:00:00 2001 From: qimiko <25387744+qimiko@users.noreply.github.com> Date: Thu, 27 Jun 2024 18:04:18 -0700 Subject: [PATCH 08/58] please fail --- .github/workflows/build.yml | 2 +- cmake/Platform.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7339959f..df61cad4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ on: build-debug-info: description: 'Profile and debug the build process' required: false - default: false + default: true type: boolean use-ccache: description: 'Enable ccache/sccache' diff --git a/cmake/Platform.cmake b/cmake/Platform.cmake index d0258a33..bee27018 100644 --- a/cmake/Platform.cmake +++ b/cmake/Platform.cmake @@ -26,6 +26,7 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "MacOS") # only exists as a global property set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13") + target_compile_options(${PROJECT_NAME} INTERFACE "-mmacos-version-min=10.13") target_link_libraries(${PROJECT_NAME} INTERFACE "-framework Cocoa" From 3b8e14eaf77da96d41efe0028168949ee5c6f85b Mon Sep 17 00:00:00 2001 From: qimiko <25387744+qimiko@users.noreply.github.com> Date: Thu, 27 Jun 2024 18:08:43 -0700 Subject: [PATCH 09/58] oops --- .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 df61cad4..c84460bd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -149,7 +149,7 @@ jobs: uses: ./.github/actions/build-debug-info with: has-sccache: ${{ inputs.use-ccache }} - if: inputs.build-debug-info + # if: inputs.build-debug-info - name: Setup caches uses: ./.github/actions/setup-cache @@ -211,7 +211,7 @@ jobs: uses: ./.github/actions/build-debug-info-post with: target: mac - if: inputs.build-debug-info && (success() || failure()) + if: success() || failure() build-android: strategy: From 48bd891398065d67c7fbdbfcf2df0fa757c58690 Mon Sep 17 00:00:00 2001 From: qimiko <25387744+qimiko@users.noreply.github.com> Date: Thu, 27 Jun 2024 18:29:36 -0700 Subject: [PATCH 10/58] what if it's like this --- .github/workflows/build.yml | 2 +- cmake/Platform.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c84460bd..bde8562f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -149,7 +149,7 @@ jobs: uses: ./.github/actions/build-debug-info with: has-sccache: ${{ inputs.use-ccache }} - # if: inputs.build-debug-info + if: true - name: Setup caches uses: ./.github/actions/setup-cache diff --git a/cmake/Platform.cmake b/cmake/Platform.cmake index bee27018..d4030607 100644 --- a/cmake/Platform.cmake +++ b/cmake/Platform.cmake @@ -26,7 +26,7 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "MacOS") # only exists as a global property set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13") - target_compile_options(${PROJECT_NAME} INTERFACE "-mmacos-version-min=10.13") + target_compile_options(${PROJECT_NAME} INTERFACE "-lmacos-version-min=10.13") target_link_libraries(${PROJECT_NAME} INTERFACE "-framework Cocoa" From 432fef707b26c0d9fd7aeb560e2370b714a30ec4 Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 13:40:30 +0300 Subject: [PATCH 11/58] try --- .github/workflows/build.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bde8562f..dcf2343b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -148,8 +148,7 @@ jobs: id: build-debug-info uses: ./.github/actions/build-debug-info with: - has-sccache: ${{ inputs.use-ccache }} - if: true + has-sccache: true - name: Setup caches uses: ./.github/actions/setup-cache @@ -177,13 +176,13 @@ jobs: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" - -DCMAKE_AR='/usr/bin/ar' - -DCMAKE_RANLIB='/usr/bin/ranlib' -DGEODE_DISABLE_PRECOMPILED_HEADERS=Off -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" ${{ steps.build-debug-info.outputs.extra-configure }} env: MACOSX_DEPLOYMENT_TARGET: "10.13" + CPPFLAGS: "-I/opt/homebrew/opt/llvm/include" + LDFLAGS: "-L/opt/homebrew/opt/llvm/lib -Wl,-rpath,/opt/homebrew/opt/llvm/lib" - name: Build run: | @@ -191,6 +190,8 @@ jobs: ${{ steps.build-debug-info.outputs.extra-build }} env: MACOSX_DEPLOYMENT_TARGET: "10.13" + CPPFLAGS: "-I/opt/homebrew/opt/llvm/include" + LDFLAGS: "-L/opt/homebrew/opt/llvm/lib -Wl,-rpath,/opt/homebrew/opt/llvm/lib" - name: Upload Artifacts uses: actions/upload-artifact@v4 From 21a5b210090e2f9532f170fc70293c3a40acde4d Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 13:56:25 +0300 Subject: [PATCH 12/58] llvm ar ranlib --- .github/workflows/build.yml | 2 ++ cmake/Platform.cmake | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dcf2343b..fe9720fc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -175,6 +175,8 @@ jobs: ${{ env.base-configure-command }} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ + -DCMAKE_AR=llvm-ar + -DCMAKE_RANLIB=llvm-ranlib -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" -DGEODE_DISABLE_PRECOMPILED_HEADERS=Off -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" diff --git a/cmake/Platform.cmake b/cmake/Platform.cmake index d4030607..6e163553 100644 --- a/cmake/Platform.cmake +++ b/cmake/Platform.cmake @@ -26,7 +26,7 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "MacOS") # only exists as a global property set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13") - target_compile_options(${PROJECT_NAME} INTERFACE "-lmacos-version-min=10.13") + #target_compile_options(${PROJECT_NAME} INTERFACE "-mmacos-version-min=10.13") target_link_libraries(${PROJECT_NAME} INTERFACE "-framework Cocoa" From c0edf946ef50de4961541943aaaa61278aa14ee6 Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 14:02:49 +0300 Subject: [PATCH 13/58] hm oka whatever so what if i actually --- .github/workflows/build.yml | 10 +++++----- cmake/Platform.cmake | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fe9720fc..b6c1951f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -175,14 +175,14 @@ jobs: ${{ env.base-configure-command }} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ - -DCMAKE_AR=llvm-ar - -DCMAKE_RANLIB=llvm-ranlib - -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" + -DCMAKE_AR='/usr/bin/ar' + -DCMAKE_RANLIB='/usr/bin/ranlib' + -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" -DGEODE_DISABLE_PRECOMPILED_HEADERS=Off -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" ${{ steps.build-debug-info.outputs.extra-configure }} env: - MACOSX_DEPLOYMENT_TARGET: "10.13" + MACOSX_DEPLOYMENT_TARGET: "10.15" CPPFLAGS: "-I/opt/homebrew/opt/llvm/include" LDFLAGS: "-L/opt/homebrew/opt/llvm/lib -Wl,-rpath,/opt/homebrew/opt/llvm/lib" @@ -191,7 +191,7 @@ jobs: ${{ env.base-build-command }} ${{ steps.build-debug-info.outputs.extra-build }} env: - MACOSX_DEPLOYMENT_TARGET: "10.13" + MACOSX_DEPLOYMENT_TARGET: "10.15" CPPFLAGS: "-I/opt/homebrew/opt/llvm/include" LDFLAGS: "-L/opt/homebrew/opt/llvm/lib -Wl,-rpath,/opt/homebrew/opt/llvm/lib" diff --git a/cmake/Platform.cmake b/cmake/Platform.cmake index 6e163553..a851461b 100644 --- a/cmake/Platform.cmake +++ b/cmake/Platform.cmake @@ -25,8 +25,8 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "MacOS") endif() # only exists as a global property - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13") - #target_compile_options(${PROJECT_NAME} INTERFACE "-mmacos-version-min=10.13") + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15") + #target_compile_options(${PROJECT_NAME} INTERFACE "-mmacos-version-min=10.15") target_link_libraries(${PROJECT_NAME} INTERFACE "-framework Cocoa" From 8d741e534e63b11e8e6c6b8b0fc079cca9f6f3e1 Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 14:08:12 +0300 Subject: [PATCH 14/58] can it build only arm --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b6c1951f..e17350ab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -179,7 +179,7 @@ jobs: -DCMAKE_RANLIB='/usr/bin/ranlib' -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" -DGEODE_DISABLE_PRECOMPILED_HEADERS=Off - -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" + -DCMAKE_OSX_ARCHITECTURES="arm64" ${{ steps.build-debug-info.outputs.extra-configure }} env: MACOSX_DEPLOYMENT_TARGET: "10.15" From 3ac48d2c2776efb169e4cd9541ab113e98477c89 Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 14:20:42 +0300 Subject: [PATCH 15/58] idkkk --- .github/workflows/build.yml | 20 ++++++++++---------- cmake/Platform.cmake | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e17350ab..6823c478 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -148,14 +148,14 @@ jobs: id: build-debug-info uses: ./.github/actions/build-debug-info with: - has-sccache: true + has-sccache: false - - name: Setup caches - uses: ./.github/actions/setup-cache - with: - host: mac - target: mac - use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} + #- name: Setup caches + # uses: ./.github/actions/setup-cache + # with: + # host: mac + # target: mac + # use-ccache: false - name: Setup Ninja uses: ./.github/actions/setup-ninja @@ -179,12 +179,12 @@ jobs: -DCMAKE_RANLIB='/usr/bin/ranlib' -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" -DGEODE_DISABLE_PRECOMPILED_HEADERS=Off - -DCMAKE_OSX_ARCHITECTURES="arm64" + -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" ${{ steps.build-debug-info.outputs.extra-configure }} env: MACOSX_DEPLOYMENT_TARGET: "10.15" CPPFLAGS: "-I/opt/homebrew/opt/llvm/include" - LDFLAGS: "-L/opt/homebrew/opt/llvm/lib -Wl,-rpath,/opt/homebrew/opt/llvm/lib" + LDFLAGS: "-L/opt/homebrew/opt/llvm/lib" - name: Build run: | @@ -193,7 +193,7 @@ jobs: env: MACOSX_DEPLOYMENT_TARGET: "10.15" CPPFLAGS: "-I/opt/homebrew/opt/llvm/include" - LDFLAGS: "-L/opt/homebrew/opt/llvm/lib -Wl,-rpath,/opt/homebrew/opt/llvm/lib" + LDFLAGS: "-L/opt/homebrew/opt/llvm/lib" - name: Upload Artifacts uses: actions/upload-artifact@v4 diff --git a/cmake/Platform.cmake b/cmake/Platform.cmake index a851461b..ecf6d548 100644 --- a/cmake/Platform.cmake +++ b/cmake/Platform.cmake @@ -26,7 +26,7 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "MacOS") # only exists as a global property set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15") - #target_compile_options(${PROJECT_NAME} INTERFACE "-mmacos-version-min=10.15") + target_compile_options(${PROJECT_NAME} INTERFACE "-mmacos-version-min=10.15") target_link_libraries(${PROJECT_NAME} INTERFACE "-framework Cocoa" From b4c9b62e323f551ff42c4441350203821a563cf7 Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 14:31:44 +0300 Subject: [PATCH 16/58] fuckig --- .github/workflows/build.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6823c478..260f8617 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -149,6 +149,7 @@ jobs: uses: ./.github/actions/build-debug-info with: has-sccache: false + if: false #- name: Setup caches # uses: ./.github/actions/setup-cache @@ -166,9 +167,15 @@ jobs: run: | brew install llvm echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH + ls /opt/homebrew/opt/llvm/ + ls /opt/homebrew/opt/llvm/bin/ + ls /opt/homebrew/Cellar/llvm/ + ls /opt/homebrew/Cellar/llvm/18.1.7/ + ls /opt/homebrew/Cellar/llvm/18.1.7/lib/ - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main + if: false - name: Configure run: > @@ -185,6 +192,7 @@ jobs: MACOSX_DEPLOYMENT_TARGET: "10.15" CPPFLAGS: "-I/opt/homebrew/opt/llvm/include" LDFLAGS: "-L/opt/homebrew/opt/llvm/lib" + if: false - name: Build run: | @@ -194,27 +202,31 @@ jobs: MACOSX_DEPLOYMENT_TARGET: "10.15" CPPFLAGS: "-I/opt/homebrew/opt/llvm/include" LDFLAGS: "-L/opt/homebrew/opt/llvm/lib" + if: false - name: Upload Artifacts uses: actions/upload-artifact@v4 with: name: geode-mac path: ./bin/nightly + if: false - name: Package Installer run: ./installer/mac/package.sh ./bin/nightly ./installer/mac/geode-installer-mac.pkg + if: false - name: Upload Installer uses: actions/upload-artifact@v4 with: name: geode-installer-mac path: './installer/mac/geode-installer-mac.pkg' + if: false - name: Complete Build Debug Info uses: ./.github/actions/build-debug-info-post with: target: mac - if: success() || failure() + if: false && (success() || failure()) build-android: strategy: From 913cdaa9d51682f0c6b1b06a4d75ccfbcb9fa51f Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 14:36:08 +0300 Subject: [PATCH 17/58] a --- .github/workflows/build.yml | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 260f8617..eb599890 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -149,14 +149,14 @@ jobs: uses: ./.github/actions/build-debug-info with: has-sccache: false - if: false - #- name: Setup caches - # uses: ./.github/actions/setup-cache - # with: - # host: mac - # target: mac - # use-ccache: false + - name: Setup caches + uses: ./.github/actions/setup-cache + with: + host: mac + target: mac + use-ccache: false + if: false - name: Setup Ninja uses: ./.github/actions/setup-ninja @@ -165,17 +165,11 @@ jobs: - name: Install LLVM run: | - brew install llvm + brew install llvm@17 echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH - ls /opt/homebrew/opt/llvm/ - ls /opt/homebrew/opt/llvm/bin/ - ls /opt/homebrew/Cellar/llvm/ - ls /opt/homebrew/Cellar/llvm/18.1.7/ - ls /opt/homebrew/Cellar/llvm/18.1.7/lib/ - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main - if: false - name: Configure run: > @@ -190,9 +184,6 @@ jobs: ${{ steps.build-debug-info.outputs.extra-configure }} env: MACOSX_DEPLOYMENT_TARGET: "10.15" - CPPFLAGS: "-I/opt/homebrew/opt/llvm/include" - LDFLAGS: "-L/opt/homebrew/opt/llvm/lib" - if: false - name: Build run: | @@ -200,27 +191,21 @@ jobs: ${{ steps.build-debug-info.outputs.extra-build }} env: MACOSX_DEPLOYMENT_TARGET: "10.15" - CPPFLAGS: "-I/opt/homebrew/opt/llvm/include" - LDFLAGS: "-L/opt/homebrew/opt/llvm/lib" - if: false - name: Upload Artifacts uses: actions/upload-artifact@v4 with: name: geode-mac path: ./bin/nightly - if: false - name: Package Installer run: ./installer/mac/package.sh ./bin/nightly ./installer/mac/geode-installer-mac.pkg - if: false - name: Upload Installer uses: actions/upload-artifact@v4 with: name: geode-installer-mac path: './installer/mac/geode-installer-mac.pkg' - if: false - name: Complete Build Debug Info uses: ./.github/actions/build-debug-info-post From b774debf1e57755c825355b62a7cecf4695fe900 Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 14:38:37 +0300 Subject: [PATCH 18/58] 17 --- .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 eb599890..6d39f8a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -174,8 +174,8 @@ jobs: - name: Configure run: > ${{ env.base-configure-command }} - -DCMAKE_C_COMPILER=clang - -DCMAKE_CXX_COMPILER=clang++ + -DCMAKE_C_COMPILER=clang-17 + -DCMAKE_CXX_COMPILER=clang++-17 -DCMAKE_AR='/usr/bin/ar' -DCMAKE_RANLIB='/usr/bin/ranlib' -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" From 4643044ff3fffcc437e7cb45c384094ebb31cb90 Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 14:41:29 +0300 Subject: [PATCH 19/58] wai whoops --- .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 6d39f8a6..409f8bed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -166,7 +166,7 @@ jobs: - name: Install LLVM run: | brew install llvm@17 - echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH + echo "/opt/homebrew/opt/llvm@17/bin" >> $GITHUB_PATH - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main @@ -174,8 +174,8 @@ jobs: - name: Configure run: > ${{ env.base-configure-command }} - -DCMAKE_C_COMPILER=clang-17 - -DCMAKE_CXX_COMPILER=clang++-17 + -DCMAKE_C_COMPILER=clang + -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_AR='/usr/bin/ar' -DCMAKE_RANLIB='/usr/bin/ranlib' -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" From a4197cdf8079b11b2ddc3a15bf6d83b90a85921c Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 14:46:25 +0300 Subject: [PATCH 20/58] dfgj --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 409f8bed..c904f8c4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -211,7 +211,7 @@ jobs: uses: ./.github/actions/build-debug-info-post with: target: mac - if: false && (success() || failure()) + if: success() || failure() build-android: strategy: From c5b1ba3af5ed5416b4380e994a6bb17b121b9d9b Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 14:48:37 +0300 Subject: [PATCH 21/58] errrmmmmm --- .github/actions/build-debug-info/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build-debug-info/action.yml b/.github/actions/build-debug-info/action.yml index 4f2e65d9..64121cb0 100644 --- a/.github/actions/build-debug-info/action.yml +++ b/.github/actions/build-debug-info/action.yml @@ -15,7 +15,7 @@ outputs: description: 'Extra stuff for CMake build step' value: | python3 ./ninjatracing/ninjatracing ./build/.ninja_log > ./build-debug-info/ninja-trace.json - ${{ inputs.has-sccache && 'sccache --show-adv-stats' || '' }} + #${{ inputs.has-sccache && 'sccache --show-adv-stats' || '' }} runs: using: "composite" From e6fedb0be0561babf3207ebd37b733c4eaed7155 Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 14:56:40 +0300 Subject: [PATCH 22/58] i want apple clang compile commands --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c904f8c4..04a7c193 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -167,6 +167,7 @@ jobs: run: | brew install llvm@17 echo "/opt/homebrew/opt/llvm@17/bin" >> $GITHUB_PATH + if: false - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main From 193899bf3d3d0f2d4305750e456bdf2910d4f49c Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 15:05:39 +0300 Subject: [PATCH 23/58] try llvm 14 idfk --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 04a7c193..1a3e98c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -165,9 +165,8 @@ jobs: - name: Install LLVM run: | - brew install llvm@17 - echo "/opt/homebrew/opt/llvm@17/bin" >> $GITHUB_PATH - if: false + brew install llvm@14 + echo "/opt/homebrew/opt/llvm@14/bin" >> $GITHUB_PATH - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main From 0bb056d08e1eb0f0049bd042d4c5237042c9242f Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 15:17:24 +0300 Subject: [PATCH 24/58] uh --- .github/workflows/build.yml | 6 +----- cmake/Platform.cmake | 4 ---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1a3e98c1..8b503d02 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -167,6 +167,7 @@ jobs: run: | brew install llvm@14 echo "/opt/homebrew/opt/llvm@14/bin" >> $GITHUB_PATH + if: false - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main @@ -178,19 +179,14 @@ jobs: -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_AR='/usr/bin/ar' -DCMAKE_RANLIB='/usr/bin/ranlib' - -DCMAKE_OSX_DEPLOYMENT_TARGET="10.15" -DGEODE_DISABLE_PRECOMPILED_HEADERS=Off -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" ${{ steps.build-debug-info.outputs.extra-configure }} - env: - MACOSX_DEPLOYMENT_TARGET: "10.15" - name: Build run: | ${{ env.base-build-command }} ${{ steps.build-debug-info.outputs.extra-build }} - env: - MACOSX_DEPLOYMENT_TARGET: "10.15" - name: Upload Artifacts uses: actions/upload-artifact@v4 diff --git a/cmake/Platform.cmake b/cmake/Platform.cmake index ecf6d548..09f15d19 100644 --- a/cmake/Platform.cmake +++ b/cmake/Platform.cmake @@ -24,10 +24,6 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "MacOS") set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64") endif() - # only exists as a global property - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15") - target_compile_options(${PROJECT_NAME} INTERFACE "-mmacos-version-min=10.15") - target_link_libraries(${PROJECT_NAME} INTERFACE "-framework Cocoa" "-framework OpenGL" From 57e9e7f62710802104099b1137e67e9ada707afa Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 15:23:24 +0300 Subject: [PATCH 25/58] =?UTF-8?q?=E2=9D=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8b503d02..e4665999 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -182,11 +182,15 @@ jobs: -DGEODE_DISABLE_PRECOMPILED_HEADERS=Off -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" ${{ steps.build-debug-info.outputs.extra-configure }} + env: + MACOSX_DEPLOYMENT_TARGET: "10.15" - name: Build run: | ${{ env.base-build-command }} ${{ steps.build-debug-info.outputs.extra-build }} + env: + MACOSX_DEPLOYMENT_TARGET: "10.15" - name: Upload Artifacts uses: actions/upload-artifact@v4 From 5eedc99b4f140156effae4c09846c82805880fa6 Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 15:27:30 +0300 Subject: [PATCH 26/58] try older sdk --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e4665999..68160270 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -181,6 +181,7 @@ jobs: -DCMAKE_RANLIB='/usr/bin/ranlib' -DGEODE_DISABLE_PRECOMPILED_HEADERS=Off -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" + -DCMAKE_OSX_SYSROOT=/Applications/Xcode_14.3.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.3.sdk ${{ steps.build-debug-info.outputs.extra-configure }} env: MACOSX_DEPLOYMENT_TARGET: "10.15" From 08ccb5422b74c5efc897b9a243d57a26771766ad Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 22:06:51 +0300 Subject: [PATCH 27/58] ok so --- .github/actions/build-debug-info/action.yml | 2 +- .github/workflows/build.yml | 19 ++++++------------- cmake/Platform.cmake | 3 +++ 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/actions/build-debug-info/action.yml b/.github/actions/build-debug-info/action.yml index 64121cb0..4f2e65d9 100644 --- a/.github/actions/build-debug-info/action.yml +++ b/.github/actions/build-debug-info/action.yml @@ -15,7 +15,7 @@ outputs: description: 'Extra stuff for CMake build step' value: | python3 ./ninjatracing/ninjatracing ./build/.ninja_log > ./build-debug-info/ninja-trace.json - #${{ inputs.has-sccache && 'sccache --show-adv-stats' || '' }} + ${{ inputs.has-sccache && 'sccache --show-adv-stats' || '' }} runs: using: "composite" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 68160270..9254ffd5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,12 +6,12 @@ on: build-debug-info: description: 'Profile and debug the build process' required: false - default: true + default: false type: boolean use-ccache: description: 'Enable ccache/sccache' required: false - default: false + default: true type: boolean pull_request: push: @@ -148,14 +148,14 @@ jobs: id: build-debug-info uses: ./.github/actions/build-debug-info with: - has-sccache: false + has-sccache: ${{ inputs.use-ccache }} - name: Setup caches uses: ./.github/actions/setup-cache with: host: mac target: mac - use-ccache: false + use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} if: false - name: Setup Ninja @@ -165,9 +165,8 @@ jobs: - name: Install LLVM run: | - brew install llvm@14 - echo "/opt/homebrew/opt/llvm@14/bin" >> $GITHUB_PATH - if: false + brew install llvm@17 + echo "/opt/homebrew/opt/llvm@17/bin" >> $GITHUB_PATH - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main @@ -180,18 +179,12 @@ jobs: -DCMAKE_AR='/usr/bin/ar' -DCMAKE_RANLIB='/usr/bin/ranlib' -DGEODE_DISABLE_PRECOMPILED_HEADERS=Off - -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" - -DCMAKE_OSX_SYSROOT=/Applications/Xcode_14.3.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.3.sdk ${{ steps.build-debug-info.outputs.extra-configure }} - env: - MACOSX_DEPLOYMENT_TARGET: "10.15" - name: Build run: | ${{ env.base-build-command }} ${{ steps.build-debug-info.outputs.extra-build }} - env: - MACOSX_DEPLOYMENT_TARGET: "10.15" - name: Upload Artifacts uses: actions/upload-artifact@v4 diff --git a/cmake/Platform.cmake b/cmake/Platform.cmake index 09f15d19..e4eb18f8 100644 --- a/cmake/Platform.cmake +++ b/cmake/Platform.cmake @@ -24,6 +24,9 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "MacOS") set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64") endif() + # only exists as a global property + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15") + target_link_libraries(${PROJECT_NAME} INTERFACE "-framework Cocoa" "-framework OpenGL" From 2d13305dc58383af2c7420f51d00138734fd24b5 Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 23:14:59 +0300 Subject: [PATCH 28/58] shouldnt need the quotes --- cmake/Platform.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Platform.cmake b/cmake/Platform.cmake index e4eb18f8..a1fd167a 100644 --- a/cmake/Platform.cmake +++ b/cmake/Platform.cmake @@ -25,7 +25,7 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "MacOS") endif() # only exists as a global property - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15") + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15) target_link_libraries(${PROJECT_NAME} INTERFACE "-framework Cocoa" From b2dcbe73bd44f17288a24ae49d88d07591c2d5eb Mon Sep 17 00:00:00 2001 From: ConfiG Date: Fri, 28 Jun 2024 23:16:36 +0300 Subject: [PATCH 29/58] Update build.yml --- .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 9254ffd5..718cf661 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -149,6 +149,7 @@ jobs: uses: ./.github/actions/build-debug-info with: has-sccache: ${{ inputs.use-ccache }} + if: inputs.build-debug-info - name: Setup caches uses: ./.github/actions/setup-cache @@ -156,7 +157,6 @@ jobs: host: mac target: mac use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} - if: false - name: Setup Ninja uses: ./.github/actions/setup-ninja @@ -205,7 +205,7 @@ jobs: uses: ./.github/actions/build-debug-info-post with: target: mac - if: success() || failure() + if: inputs.build-debug-info && (success() || failure()) build-android: strategy: From df0684aeb929886eaa44b3781cf84672e9b7ae6e Mon Sep 17 00:00:00 2001 From: mat <26722564+matcool@users.noreply.github.com> Date: Sun, 7 Jul 2024 01:36:39 -0300 Subject: [PATCH 30/58] but what if we try llvm 16 --- .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 718cf661..76d3fc65 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -165,8 +165,8 @@ jobs: - name: Install LLVM run: | - brew install llvm@17 - echo "/opt/homebrew/opt/llvm@17/bin" >> $GITHUB_PATH + brew install llvm@16 + echo "/opt/homebrew/opt/llvm@16/bin" >> $GITHUB_PATH - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main From 1d8a64f77edae2d2cba567e85705e4fec4298e6a Mon Sep 17 00:00:00 2001 From: mat <26722564+matcool@users.noreply.github.com> Date: Sun, 7 Jul 2024 01:41:00 -0300 Subject: [PATCH 31/58] remember to undo this pls --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1eb8a5ac..40cb50b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,7 @@ if (DEFINED ENV{GEODE_BINDINGS_REPO_PATH}) # this is so stupid i hate windows paths string(REPLACE "\\" "/" GEODE_BINDINGS_REPO_PATH ${temp}) endif() - +set(SKIP_BUILDING_CODEGEN OFF) if (NOT GEODE_BINDINGS_REPO_PATH) message(STATUS "No override path for bindings provided, using CPM to clone default. " @@ -77,7 +77,7 @@ if (NOT GEODE_BINDINGS_REPO_PATH) ) CPMAddPackage(NAME "bindings" GITHUB_REPOSITORY "geode-sdk/bindings" - GIT_TAG "main" + GIT_TAG "6a055819c91b900cad54ea5ad1a0ba9981e4e6bd" DOWNLOAD_ONLY YES NO_CACHE YES ) From 37590e957fa10d642478563ef56ee4cf5d81370b Mon Sep 17 00:00:00 2001 From: mat <26722564+matcool@users.noreply.github.com> Date: Sun, 7 Jul 2024 01:50:32 -0300 Subject: [PATCH 32/58] llvm 15 --- .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 76d3fc65..9c3a60bd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,6 +33,7 @@ env: jobs: build-windows: name: Build Windows + if: false runs-on: ubuntu-24.04 steps: @@ -165,8 +166,8 @@ jobs: - name: Install LLVM run: | - brew install llvm@16 - echo "/opt/homebrew/opt/llvm@16/bin" >> $GITHUB_PATH + brew install llvm@15 + echo "/opt/homebrew/opt/llvm@15/bin" >> $GITHUB_PATH - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main @@ -222,6 +223,7 @@ jobs: name: Build ${{ matrix.config.name }} runs-on: ubuntu-latest + if: false steps: - name: Checkout From 13b30ffbafe3c6fdf8b28fec66fdcf5f73bf4bbe Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Thu, 25 Jul 2024 18:36:34 -0700 Subject: [PATCH 33/58] why did we do this anyways --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 32a0e00f..8fbfc08e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,7 @@ if (DEFINED ENV{GEODE_BINDINGS_REPO_PATH}) # this is so stupid i hate windows paths string(REPLACE "\\" "/" GEODE_BINDINGS_REPO_PATH ${temp}) endif() -set(SKIP_BUILDING_CODEGEN OFF) + if (NOT GEODE_BINDINGS_REPO_PATH) message(STATUS "No override path for bindings provided, using CPM to clone default. " @@ -77,7 +77,7 @@ if (NOT GEODE_BINDINGS_REPO_PATH) ) CPMAddPackage(NAME "bindings" GITHUB_REPOSITORY "geode-sdk/bindings" - GIT_TAG "6a055819c91b900cad54ea5ad1a0ba9981e4e6bd" + GIT_TAG "main" DOWNLOAD_ONLY YES NO_CACHE YES ) From 78e78e4c744148c0ce16b0d22e36fccb61a9ac67 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Thu, 25 Jul 2024 18:42:50 -0700 Subject: [PATCH 34/58] umm what --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20819a9a..f4d4a32e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -180,6 +180,7 @@ jobs: ${{ env.base-configure-command }} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ + -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_AR='/usr/bin/ar' -DCMAKE_RANLIB='/usr/bin/ranlib' -DGEODE_DISABLE_PRECOMPILED_HEADERS=Off From 0fdc519c51ae3656e40f73fa7a97aff745596df2 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Thu, 25 Jul 2024 18:45:25 -0700 Subject: [PATCH 35/58] ??? --- .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 f4d4a32e..e802b2e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -169,8 +169,8 @@ jobs: - name: Install LLVM run: | - brew install llvm@15 - echo "/opt/homebrew/opt/llvm@15/bin" >> $GITHUB_PATH + brew install llvm + echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main From 0005f4ed667872cdb72e68fb141cb335ba687c48 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Thu, 25 Jul 2024 18:53:15 -0700 Subject: [PATCH 36/58] =?UTF-8?q?let's=20try=20pch=20=F0=9F=98=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 8 ++++---- CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e802b2e7..0dc74a1f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -167,10 +167,10 @@ jobs: with: host: mac - - name: Install LLVM - run: | - brew install llvm - echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH + # - name: Install LLVM + # run: | + # brew install llvm + # echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main diff --git a/CMakeLists.txt b/CMakeLists.txt index 8fbfc08e..22d90429 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,7 +132,7 @@ endif() if (DEFINED GEODE_CCACHE_VARIANT) if (NOT DEFINED GEODE_DISABLE_PRECOMPILED_HEADERS) - if (${GEODE_CCACHE_VARIANT} STREQUAL "sccache" AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + if (${GEODE_CCACHE_VARIANT} STREQUAL "sccache" AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")) message(NOTICE "Using ${GEODE_CCACHE_VARIANT} with ${CMAKE_CXX_COMPILER_ID}, PCH will be enabled.") set(GEODE_DISABLE_PRECOMPILED_HEADERS OFF) else() From 93793ac816032bee1e2a3bb743e8e683b34d8cdd Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Thu, 25 Jul 2024 19:07:19 -0700 Subject: [PATCH 37/58] =?UTF-8?q?=F0=9F=A5=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/actions/setup-cache/action.yml | 34 +++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/actions/setup-cache/action.yml b/.github/actions/setup-cache/action.yml index b7013a07..9e2aaa85 100644 --- a/.github/actions/setup-cache/action.yml +++ b/.github/actions/setup-cache/action.yml @@ -16,24 +16,24 @@ runs: using: "composite" steps: # https://github.com/mozilla/sccache/issues/2090 - - name: Download custom sccache - uses: robinraju/release-downloader@v1.10 - with: - repository: cgytrus/sccache - latest: true - fileName: 'sccache-*-x86_64-apple-darwin.zip' - tarBall: false - zipBall: false - out-file-path: "epic-sccache" - if: inputs.host == 'mac' && inputs.use-ccache + #- name: Download custom sccache + # uses: robinraju/release-downloader@v1.10 + # with: + # repository: cgytrus/sccache + # latest: true + # fileName: 'sccache-*-x86_64-apple-darwin.zip' + # tarBall: false + # zipBall: false + # out-file-path: "epic-sccache" + # if: inputs.host == 'mac' && inputs.use-ccache - - name: Setup custom sccache - shell: bash - run: | - 7z x "epic-sccache/sccache-*-x86_64-apple-darwin.zip" -o"epic-sccache" - echo "$GITHUB_WORKSPACE/epic-sccache" >> $GITHUB_PATH - chmod +x "epic-sccache/sccache" - if: inputs.host == 'mac' && inputs.use-ccache + #- name: Setup custom sccache + # shell: bash + # run: | + # 7z x "epic-sccache/sccache-*-x86_64-apple-darwin.zip" -o"epic-sccache" + # echo "$GITHUB_WORKSPACE/epic-sccache" >> $GITHUB_PATH + # chmod +x "epic-sccache/sccache" + # if: inputs.host == 'mac' && inputs.use-ccache - name: Setup sccache uses: hendrikmuhs/ccache-action@v1.2.13 From 826054fa64e7c2af66e0c1cf256e3cf9186c3477 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Thu, 25 Jul 2024 20:03:30 -0700 Subject: [PATCH 38/58] huh --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0dc74a1f..ff2bcf28 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -178,11 +178,7 @@ jobs: - name: Configure run: > ${{ env.base-configure-command }} - -DCMAKE_C_COMPILER=clang - -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 - -DCMAKE_AR='/usr/bin/ar' - -DCMAKE_RANLIB='/usr/bin/ranlib' -DGEODE_DISABLE_PRECOMPILED_HEADERS=Off ${{ steps.build-debug-info.outputs.extra-configure }} From 227ab289126d813bd413e89a4e4f823214739b32 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Thu, 25 Jul 2024 20:17:05 -0700 Subject: [PATCH 39/58] just to see --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ff2bcf28..14d06793 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -160,7 +160,7 @@ jobs: with: host: mac target: mac - use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} + use-ccache: false - name: Setup Ninja uses: ./.github/actions/setup-ninja @@ -178,7 +178,11 @@ jobs: - name: Configure run: > ${{ env.base-configure-command }} + -DCMAKE_C_COMPILER=clang + -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 + -DCMAKE_AR='/usr/bin/ar' + -DCMAKE_RANLIB='/usr/bin/ranlib' -DGEODE_DISABLE_PRECOMPILED_HEADERS=Off ${{ steps.build-debug-info.outputs.extra-configure }} From 807da4754f1d7cf2e7d97163aa3ab2b5521d57c9 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Thu, 25 Jul 2024 20:19:04 -0700 Subject: [PATCH 40/58] that was not it --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 14d06793..7cd3ec3e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -155,12 +155,12 @@ jobs: has-sccache: ${{ inputs.use-ccache }} if: inputs.build-debug-info - - name: Setup caches - uses: ./.github/actions/setup-cache - with: - host: mac - target: mac - use-ccache: false + #- name: Setup caches + # uses: ./.github/actions/setup-cache + # with: + # host: mac + # target: mac + # use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} - name: Setup Ninja uses: ./.github/actions/setup-ninja From 4dc5ba07d0deb80b566a92653b320bdaca987060 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Thu, 25 Jul 2024 20:33:01 -0700 Subject: [PATCH 41/58] just seeing --- .github/actions/setup-cache/action.yml | 34 +++++++++++++------------- .github/workflows/build.yml | 14 +++++------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/actions/setup-cache/action.yml b/.github/actions/setup-cache/action.yml index 9e2aaa85..b7013a07 100644 --- a/.github/actions/setup-cache/action.yml +++ b/.github/actions/setup-cache/action.yml @@ -16,24 +16,24 @@ runs: using: "composite" steps: # https://github.com/mozilla/sccache/issues/2090 - #- name: Download custom sccache - # uses: robinraju/release-downloader@v1.10 - # with: - # repository: cgytrus/sccache - # latest: true - # fileName: 'sccache-*-x86_64-apple-darwin.zip' - # tarBall: false - # zipBall: false - # out-file-path: "epic-sccache" - # if: inputs.host == 'mac' && inputs.use-ccache + - name: Download custom sccache + uses: robinraju/release-downloader@v1.10 + with: + repository: cgytrus/sccache + latest: true + fileName: 'sccache-*-x86_64-apple-darwin.zip' + tarBall: false + zipBall: false + out-file-path: "epic-sccache" + if: inputs.host == 'mac' && inputs.use-ccache - #- name: Setup custom sccache - # shell: bash - # run: | - # 7z x "epic-sccache/sccache-*-x86_64-apple-darwin.zip" -o"epic-sccache" - # echo "$GITHUB_WORKSPACE/epic-sccache" >> $GITHUB_PATH - # chmod +x "epic-sccache/sccache" - # if: inputs.host == 'mac' && inputs.use-ccache + - name: Setup custom sccache + shell: bash + run: | + 7z x "epic-sccache/sccache-*-x86_64-apple-darwin.zip" -o"epic-sccache" + echo "$GITHUB_WORKSPACE/epic-sccache" >> $GITHUB_PATH + chmod +x "epic-sccache/sccache" + if: inputs.host == 'mac' && inputs.use-ccache - name: Setup sccache uses: hendrikmuhs/ccache-action@v1.2.13 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7cd3ec3e..3eccc136 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ on: build-debug-info: description: 'Profile and debug the build process' required: false - default: false + default: true type: boolean use-ccache: description: 'Enable ccache/sccache' @@ -155,12 +155,12 @@ jobs: has-sccache: ${{ inputs.use-ccache }} if: inputs.build-debug-info - #- name: Setup caches - # uses: ./.github/actions/setup-cache - # with: - # host: mac - # target: mac - # use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} + - name: Setup caches + uses: ./.github/actions/setup-cache + with: + host: mac + target: mac + use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} - name: Setup Ninja uses: ./.github/actions/setup-ninja From cd2fcdc078d594b0ec19b8e629e18c43036c542d Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Thu, 25 Jul 2024 20:47:42 -0700 Subject: [PATCH 42/58] i forgot. --- .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 3eccc136..22f53fad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ on: build-debug-info: description: 'Profile and debug the build process' required: false - default: true + default: false type: boolean use-ccache: description: 'Enable ccache/sccache' @@ -153,7 +153,7 @@ jobs: uses: ./.github/actions/build-debug-info with: has-sccache: ${{ inputs.use-ccache }} - if: inputs.build-debug-info + if: true - name: Setup caches uses: ./.github/actions/setup-cache @@ -210,7 +210,7 @@ jobs: uses: ./.github/actions/build-debug-info-post with: target: mac - if: inputs.build-debug-info && (success() || failure()) + if: true && (success() || failure()) build-android: strategy: From ac137d84c9dcbd88712199b4c528bbacb6f5c975 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Fri, 26 Jul 2024 04:37:47 -0700 Subject: [PATCH 43/58] getting debug info again --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 22f53fad..03b4467f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -167,10 +167,10 @@ jobs: with: host: mac - # - name: Install LLVM - # run: | - # brew install llvm - # echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH + - name: Install LLVM + run: | + brew install llvm + echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main From 17e666b92d75fec5e56ced5ce9718ed51515a8e6 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Fri, 26 Jul 2024 04:50:02 -0700 Subject: [PATCH 44/58] back to that --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03b4467f..0dc74a1f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -153,7 +153,7 @@ jobs: uses: ./.github/actions/build-debug-info with: has-sccache: ${{ inputs.use-ccache }} - if: true + if: inputs.build-debug-info - name: Setup caches uses: ./.github/actions/setup-cache @@ -167,10 +167,10 @@ jobs: with: host: mac - - name: Install LLVM - run: | - brew install llvm - echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH + # - name: Install LLVM + # run: | + # brew install llvm + # echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main @@ -210,7 +210,7 @@ jobs: uses: ./.github/actions/build-debug-info-post with: target: mac - if: true && (success() || failure()) + if: inputs.build-debug-info && (success() || failure()) build-android: strategy: From a743d02bbc3c5e59d28294b6c0d43b3158d91a89 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Fri, 26 Jul 2024 05:39:48 -0700 Subject: [PATCH 45/58] performance test 2 --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0dc74a1f..e802b2e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -167,10 +167,10 @@ jobs: with: host: mac - # - name: Install LLVM - # run: | - # brew install llvm - # echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH + - name: Install LLVM + run: | + brew install llvm + echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main From 08463f2d0b780c8d067b96be4c4df3fa7cba92a8 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Fri, 26 Jul 2024 05:44:09 -0700 Subject: [PATCH 46/58] performance 3 --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e802b2e7..4f9fa5db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -155,12 +155,12 @@ jobs: has-sccache: ${{ inputs.use-ccache }} if: inputs.build-debug-info - - name: Setup caches - uses: ./.github/actions/setup-cache - with: - host: mac - target: mac - use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} + #- name: Setup caches + # uses: ./.github/actions/setup-cache + # with: + # host: mac + # target: mac + # use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} - name: Setup Ninja uses: ./.github/actions/setup-ninja From 4788df91da30aa601aa57f64f399d1066665d110 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Fri, 26 Jul 2024 05:49:07 -0700 Subject: [PATCH 47/58] check 4 woaw (apple clang + no cache) --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4f9fa5db..d20941e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -167,10 +167,10 @@ jobs: with: host: mac - - name: Install LLVM - run: | - brew install llvm - echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH + #- name: Install LLVM + # run: | + # brew install llvm + # echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main From 90676409abf9eddd2df064d22671fe1a3687d44c Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Fri, 26 Jul 2024 05:54:13 -0700 Subject: [PATCH 48/58] another one (brew llvm + no pch/cache) --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d20941e3..3190723c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -167,10 +167,10 @@ jobs: with: host: mac - #- name: Install LLVM - # run: | - # brew install llvm - # echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH + - name: Install LLVM + run: | + brew install llvm + echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main @@ -183,7 +183,7 @@ jobs: -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_AR='/usr/bin/ar' -DCMAKE_RANLIB='/usr/bin/ranlib' - -DGEODE_DISABLE_PRECOMPILED_HEADERS=Off + -DGEODE_DISABLE_PRECOMPILED_HEADERS=ON ${{ steps.build-debug-info.outputs.extra-configure }} - name: Build From 6fe0582fdff8542bd356c4f9c08f2cc00bc44ce3 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Mon, 29 Jul 2024 18:39:09 -0700 Subject: [PATCH 49/58] go back to apple clang --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3190723c..71138087 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -167,10 +167,10 @@ jobs: with: host: mac - - name: Install LLVM - run: | - brew install llvm - echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH + #- name: Install LLVM + # run: | + # brew install llvm + # echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main @@ -183,7 +183,7 @@ jobs: -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_AR='/usr/bin/ar' -DCMAKE_RANLIB='/usr/bin/ranlib' - -DGEODE_DISABLE_PRECOMPILED_HEADERS=ON + -DGEODE_DISABLE_PRECOMPILED_HEADERS=OFF ${{ steps.build-debug-info.outputs.extra-configure }} - name: Build From ec0fc78767c59e6566e8938a8948e82eea500ae4 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Mon, 29 Jul 2024 18:39:24 -0700 Subject: [PATCH 50/58] tweak the pch logic for apple --- CMakeLists.txt | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 22d90429..5ec5cc3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,18 +133,29 @@ endif() if (DEFINED GEODE_CCACHE_VARIANT) if (NOT DEFINED GEODE_DISABLE_PRECOMPILED_HEADERS) if (${GEODE_CCACHE_VARIANT} STREQUAL "sccache" AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")) - message(NOTICE "Using ${GEODE_CCACHE_VARIANT} with ${CMAKE_CXX_COMPILER_ID}, PCH will be enabled.") - set(GEODE_DISABLE_PRECOMPILED_HEADERS OFF) + if (DEFINED CMAKE_OSX_ARCHITECTURES AND CMAKE_OSX_ARCHITECTURES STREQUAL "arm64;x86_64" OR CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64;arm64") + message(NOTICE "Using ${GEODE_CCACHE_VARIANT} with ${CMAKE_CXX_COMPILER_ID} while building multiple architectures, PCH will be disabled due to issues with sccache.") + set(GEODE_DISABLE_PRECOMPILED_HEADERS ON) + else() + message(NOTICE "Using ${GEODE_CCACHE_VARIANT} with ${CMAKE_CXX_COMPILER_ID}, PCH will be enabled.") + set(GEODE_DISABLE_PRECOMPILED_HEADERS OFF) + endif() else() message(NOTICE "Using ${GEODE_CCACHE_VARIANT} with ${CMAKE_CXX_COMPILER_ID}, PCH will be disabled.") set(GEODE_DISABLE_PRECOMPILED_HEADERS ON) endif() endif() else() - message(NOTICE "Not using a caching compiler (ccache/sccache). " - "It is recommended to install one to improve build times.") - message(NOTICE "We recommend sccache, check its README for installation instructions, " - "normally you can just use your usual package manager (e.g. 'scoop install sccache').") + if (DEFINED CMAKE_OSX_ARCHITECTURES AND CMAKE_OSX_ARCHITECTURES STREQUAL "arm64;x86_64" OR CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64;arm64") + # when building for multiple architectures, a caching compiler is not recommended + message(NOTICE "Not using a caching compiler (ccache/sccache).") + else() + message(NOTICE "Not using a caching compiler (ccache/sccache). " + "It is recommended to install one to improve build times.") + message(NOTICE "We recommend sccache, check its README for installation instructions, " + "normally you can just use your usual package manager (e.g. 'scoop install sccache').") + endif() + if (NOT DEFINED GEODE_DISABLE_PRECOMPILED_HEADERS) message(NOTICE "Because of this, PCH will be enabled.") set(GEODE_DISABLE_PRECOMPILED_HEADERS OFF) From edb0fd5b85d1539e8c11e7a2ca37739f2735c6e6 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Mon, 29 Jul 2024 18:45:44 -0700 Subject: [PATCH 51/58] i don't get it --- .github/workflows/build.yml | 1 + CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 71138087..a1883a25 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -181,6 +181,7 @@ jobs: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 + -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_AR='/usr/bin/ar' -DCMAKE_RANLIB='/usr/bin/ranlib' -DGEODE_DISABLE_PRECOMPILED_HEADERS=OFF diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ec5cc3c..20409425 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,7 +133,7 @@ endif() if (DEFINED GEODE_CCACHE_VARIANT) if (NOT DEFINED GEODE_DISABLE_PRECOMPILED_HEADERS) if (${GEODE_CCACHE_VARIANT} STREQUAL "sccache" AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")) - if (DEFINED CMAKE_OSX_ARCHITECTURES AND CMAKE_OSX_ARCHITECTURES STREQUAL "arm64;x86_64" OR CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64;arm64") + if (DEFINED CMAKE_OSX_ARCHITECTURES AND (CMAKE_OSX_ARCHITECTURES STREQUAL "arm64;x86_64" OR CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64;arm64")) message(NOTICE "Using ${GEODE_CCACHE_VARIANT} with ${CMAKE_CXX_COMPILER_ID} while building multiple architectures, PCH will be disabled due to issues with sccache.") set(GEODE_DISABLE_PRECOMPILED_HEADERS ON) else() @@ -146,7 +146,7 @@ if (DEFINED GEODE_CCACHE_VARIANT) endif() endif() else() - if (DEFINED CMAKE_OSX_ARCHITECTURES AND CMAKE_OSX_ARCHITECTURES STREQUAL "arm64;x86_64" OR CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64;arm64") + if (DEFINED CMAKE_OSX_ARCHITECTURES AND (CMAKE_OSX_ARCHITECTURES STREQUAL "arm64;x86_64" OR CMAKE_OSX_ARCHITECTURES STREQUAL "x86_64;arm64")) # when building for multiple architectures, a caching compiler is not recommended message(NOTICE "Not using a caching compiler (ccache/sccache).") else() From 7aac501905faf6ab6c195310f802835cbdd5ca5e Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Mon, 29 Jul 2024 20:40:26 -0700 Subject: [PATCH 52/58] was that all that was needed --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a1883a25..35797773 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -155,12 +155,12 @@ jobs: has-sccache: ${{ inputs.use-ccache }} if: inputs.build-debug-info - #- name: Setup caches - # uses: ./.github/actions/setup-cache - # with: - # host: mac - # target: mac - # use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} + - name: Setup caches + uses: ./.github/actions/setup-cache + with: + host: mac + target: mac + use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} - name: Setup Ninja uses: ./.github/actions/setup-ninja From 28cceb16e550d49bc9e288409a15366a0b246f51 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Mon, 29 Jul 2024 20:55:31 -0700 Subject: [PATCH 53/58] concerning --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35797773..f99c3124 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -182,8 +182,6 @@ jobs: -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" - -DCMAKE_AR='/usr/bin/ar' - -DCMAKE_RANLIB='/usr/bin/ranlib' -DGEODE_DISABLE_PRECOMPILED_HEADERS=OFF ${{ steps.build-debug-info.outputs.extra-configure }} From deb379d76098dda7a1e7b8478240c307d46d0e09 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Mon, 29 Jul 2024 21:00:28 -0700 Subject: [PATCH 54/58] ??? --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f99c3124..a8b8c1ee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -141,6 +141,7 @@ jobs: env: SCCACHE_CACHE_MULTIARCH: 1 + SCCACHE_RECACHE: 1 steps: - name: Checkout From 3704aa3009701b72d28704870900055c90213f92 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Mon, 29 Jul 2024 21:15:37 -0700 Subject: [PATCH 55/58] ok like actually though --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a8b8c1ee..11ca8ed0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -156,12 +156,12 @@ jobs: has-sccache: ${{ inputs.use-ccache }} if: inputs.build-debug-info - - name: Setup caches - uses: ./.github/actions/setup-cache - with: - host: mac - target: mac - use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} + #- name: Setup caches + # uses: ./.github/actions/setup-cache + # with: + # host: mac + # target: mac + # use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} - name: Setup Ninja uses: ./.github/actions/setup-ninja From 82668ee06c8260e0678933c5c1045b1524be570e Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Mon, 29 Jul 2024 21:27:22 -0700 Subject: [PATCH 56/58] guess we see --- .github/workflows/build.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 11ca8ed0..c0c6dd10 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -156,22 +156,22 @@ jobs: has-sccache: ${{ inputs.use-ccache }} if: inputs.build-debug-info - #- name: Setup caches - # uses: ./.github/actions/setup-cache - # with: - # host: mac - # target: mac - # use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} + - name: Setup caches + uses: ./.github/actions/setup-cache + with: + host: mac + target: mac + use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} - name: Setup Ninja uses: ./.github/actions/setup-ninja with: host: mac - #- name: Install LLVM - # run: | - # brew install llvm - # echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH + - name: Install LLVM + run: | + brew install llvm + echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main From ebd65401cb752e062a3639e4d431a5387b9538ec Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Mon, 29 Jul 2024 21:33:58 -0700 Subject: [PATCH 57/58] no more seeing. --- .github/workflows/build.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c0c6dd10..0eb2cac7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -156,23 +156,18 @@ jobs: has-sccache: ${{ inputs.use-ccache }} if: inputs.build-debug-info - - name: Setup caches - uses: ./.github/actions/setup-cache - with: - host: mac - target: mac - use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} + #- name: Setup caches + # uses: ./.github/actions/setup-cache + # with: + # host: mac + # target: mac + # use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} - name: Setup Ninja uses: ./.github/actions/setup-ninja with: host: mac - - name: Install LLVM - run: | - brew install llvm - echo "/opt/homebrew/opt/llvm/bin" >> $GITHUB_PATH - - name: Setup CLI uses: geode-sdk/cli/.github/actions/setup@main From 6e2b08a2e213b19799dd1a7590f1a09fd392a0b6 Mon Sep 17 00:00:00 2001 From: Chloe <25387744+qimiko@users.noreply.github.com> Date: Sun, 4 Aug 2024 05:35:37 -0700 Subject: [PATCH 58/58] back to vanilla --- .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 0eb2cac7..80c5df29 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,6 @@ env: jobs: build-windows: name: Build Windows - if: false runs-on: ubuntu-24.04 steps: @@ -141,7 +140,6 @@ jobs: env: SCCACHE_CACHE_MULTIARCH: 1 - SCCACHE_RECACHE: 1 steps: - name: Checkout @@ -156,12 +154,14 @@ jobs: has-sccache: ${{ inputs.use-ccache }} if: inputs.build-debug-info - #- name: Setup caches - # uses: ./.github/actions/setup-cache - # with: - # host: mac - # target: mac - # use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} + # due to very strange performance issues, sccache is currently disabled for macos. sorry + + # - name: Setup caches + # uses: ./.github/actions/setup-cache + # with: + # host: mac + # target: mac + # use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }} - name: Setup Ninja uses: ./.github/actions/setup-ninja @@ -222,7 +222,6 @@ jobs: name: Build ${{ matrix.config.name }} runs-on: ubuntu-latest - if: false steps: - name: Checkout