From 5bc8369bc003b043f4bc8fe37bd816043c8fdeab Mon Sep 17 00:00:00 2001 From: matcool <26722564+matcool@users.noreply.github.com> Date: Sat, 23 Dec 2023 08:44:20 -0300 Subject: [PATCH 1/2] ignore folders start with build- like build-android --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9a773667..608f3209 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,7 @@ build build2 build-docs/ bin +/build-* # Ignore docs folders docs/** From 41a08e32a1d7280541a7fb936c0bfc4e3ecba286 Mon Sep 17 00:00:00 2001 From: matcool <26722564+matcool@users.noreply.github.com> Date: Sat, 23 Dec 2023 09:00:07 -0300 Subject: [PATCH 2/2] disable macos actions for now --- .github/workflows/build.yml | 26 +++++++++++++------------- .github/workflows/test-offsets.yml | 10 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef27125c..053ca689 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,19 +33,19 @@ jobs: package_cmd: 'makensis -WX -V3 ./installer/windows/installer.nsi' installer_path: './installer/windows/geode-installer-win.exe' - - name: macOS - os: macos-latest - id: mac - cli_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' - installer_path: './installer/mac/geode-installer-mac.pkg' + # - name: macOS + # os: macos-latest + # id: mac + # cli_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' + # installer_path: './installer/mac/geode-installer-mac.pkg' - name: Android os: ubuntu-latest diff --git a/.github/workflows/test-offsets.yml b/.github/workflows/test-offsets.yml index a4066463..f6a2f16f 100644 --- a/.github/workflows/test-offsets.yml +++ b/.github/workflows/test-offsets.yml @@ -23,11 +23,11 @@ jobs: prefixes: '' extra_flags: -A win32 -DGEODE_DEBUG=On - - name: macOS - os_identifier: mac - os: macos-latest - prefixes: PATH="/usr/local/opt/ccache/libexec:$PATH" - extra_flags: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug -DGEODE_DEBUG=On + # - name: macOS + # os_identifier: mac + # os: macos-latest + # prefixes: PATH="/usr/local/opt/ccache/libexec:$PATH" + # extra_flags: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug -DGEODE_DEBUG=On name: Test Offsets ${{ matrix.config.name }} runs-on: ${{ matrix.config.os }}