From 0cb31d187ede1613799ad537078dd511bea734f6 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Sun, 5 Oct 2025 09:08:01 -0500 Subject: [PATCH] try running mac CI on self-hosted runner --- .github/workflows/ci.yml | 104 +++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 98364c56f..2cf3b9590 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ on: { push: { - branches: [ master, ci ] + branches: [ master, ci, ci2 ] }, pull_request: { branches: [ master ] @@ -11,57 +11,57 @@ }, jobs: { - # macos-xcode: { - # runs-on: macos-13, - # env: { - # DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer - # }, - # steps: [ - # { - # name: checkout, - # uses: actions/checkout@v4, - # with: { submodules: true } - # }, - # { - # name: install Boost, - # run: brew install Boost@1.85 - # }, - # { - # name: install SFML, - # run: ./.github/workflows/scripts/mac/install-sfml.sh - # }, - # { - # name: patch Xcode project, - # run: ./.github/workflows/scripts/mac/fix-xcode-proj.sh - # }, - # { - # name: build, - # run: ./.github/workflows/scripts/mac/xcode-build.sh - # }, - # { - # name: unit tests, - # run: ./.github/workflows/scripts/mac/run-tests.sh - # } - # ] - # }, - # macos-scons: { - # runs-on: macos-13, - # steps: [ - # { - # name: checkout, - # uses: actions/checkout@v4, - # with: { submodules: true } - # }, - # { - # name: install dependencies, - # run: brew install scons SFML@2 Boost@1.85 - # }, - # { - # name: build and unit test, - # run: ./.github/workflows/scripts/mac/scons-build.sh test=true - # } - # ] - # }, + macos-xcode: { + runs-on: macos-14, + env: { + DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer + }, + steps: [ + { + name: checkout, + uses: actions/checkout@v4, + with: { submodules: true } + }, + { + name: install Boost, + run: brew install Boost@1.85 + }, + { + name: install SFML, + run: ./.github/workflows/scripts/mac/install-sfml.sh + }, + { + name: patch Xcode project, + run: ./.github/workflows/scripts/mac/fix-xcode-proj.sh + }, + { + name: build, + run: ./.github/workflows/scripts/mac/xcode-build.sh + }, + { + name: unit tests, + run: ./.github/workflows/scripts/mac/run-tests.sh + } + ] + }, + macos-scons: { + runs-on: macos-14, + steps: [ + { + name: checkout, + uses: actions/checkout@v4, + with: { submodules: true } + }, + { + name: install dependencies, + run: brew install scons SFML@2 Boost@1.85 + }, + { + name: build and unit test, + run: ./.github/workflows/scripts/mac/scons-build.sh test=true + } + ] + }, # win-vs32: { # runs-on: windows-2022, # env: {