From c7a2d6970b00f9aa9673300226fce368438cf858 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikkel=20Hjortsh=C3=B8j?= Date: Thu, 29 Oct 2020 13:23:45 +0100 Subject: [PATCH 1/8] [CI] Switch xcode version back to 11.7 --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee9c0f138..fb2cc3659 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,10 @@ jobs: build_macOS: runs-on: macOS-latest steps: + - name: Setup Xcode version + uses: maxim-lobanov/setup-xcode@v1.2.1 + with: + xcode-version: 11.7 - uses: actions/checkout@v1 - name: Download LLVM and setup PATH run: | From 45815fd26e43f7ef63a15636d02136722ca27f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikkel=20Hjortsh=C3=B8j?= Date: Thu, 29 Oct 2020 13:33:12 +0100 Subject: [PATCH 2/8] [CI] Change macos version to 11 from 10.5 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb2cc3659..22e1982c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - name: Odin check run: ./odin check examples/demo/demo.odin -vet build_macOS: - runs-on: macOS-latest + runs-on: macos-11 steps: - name: Setup Xcode version uses: maxim-lobanov/setup-xcode@v1.2.1 From 61d7cdfe925ad0d2ac840409f38bb3d872fb0cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikkel=20Hjortsh=C3=B8j?= Date: Thu, 29 Oct 2020 13:35:53 +0100 Subject: [PATCH 3/8] [CI] Fix macOS tag --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22e1982c2..7a55a2e31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - name: Odin check run: ./odin check examples/demo/demo.odin -vet build_macOS: - runs-on: macos-11 + runs-on: macos-11.0 steps: - name: Setup Xcode version uses: maxim-lobanov/setup-xcode@v1.2.1 From 6a808235fea3736276b3f5e1679971bf0fe0146b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikkel=20Hjortsh=C3=B8j?= Date: Thu, 29 Oct 2020 19:25:22 +0100 Subject: [PATCH 4/8] [CI] Change deprecated workflow commands for macOS --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a55a2e31..c6ae8ac1b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,8 +25,9 @@ jobs: - name: Download LLVM and setup PATH run: | brew install llvm - echo ::add-path::/usr/local/opt/llvm/bin - echo ::set-env name=CPATH::`xcrun --show-sdk-path`/usr/include + echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH + echo "CPATH=`xcrun --show-sdk-path`/usr/include" >> $GITHUB_ENV + echo $CPATH - name: build odin run: make release - name: Odin run From a5c6487bc11db89063c0518c132c9764b9e25bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikkel=20Hjortsh=C3=B8j?= Date: Thu, 29 Oct 2020 19:28:50 +0100 Subject: [PATCH 5/8] [CI] Try not installing our own llvm with brew --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6ae8ac1b..31a9e6925 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,12 +22,12 @@ jobs: with: xcode-version: 11.7 - uses: actions/checkout@v1 - - name: Download LLVM and setup PATH - run: | - brew install llvm - echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH - echo "CPATH=`xcrun --show-sdk-path`/usr/include" >> $GITHUB_ENV - echo $CPATH +# - name: Download LLVM and setup PATH +# run: | +# brew install llvm +# echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH +# echo "CPATH=`xcrun --show-sdk-path`/usr/include" >> $GITHUB_ENV +# echo $CPATH - name: build odin run: make release - name: Odin run From 6ae8f5a62d09284f64652f801300573d8645283f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikkel=20Hjortsh=C3=B8j?= Date: Thu, 29 Oct 2020 20:03:38 +0100 Subject: [PATCH 6/8] [CI] Try and fix CPATH setting for macOS --- .github/workflows/ci.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31a9e6925..844a1ef72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,17 +17,19 @@ jobs: build_macOS: runs-on: macos-11.0 steps: - - name: Setup Xcode version - uses: maxim-lobanov/setup-xcode@v1.2.1 - with: - xcode-version: 11.7 - uses: actions/checkout@v1 -# - name: Download LLVM and setup PATH -# run: | -# brew install llvm -# echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH -# echo "CPATH=`xcrun --show-sdk-path`/usr/include" >> $GITHUB_ENV -# echo $CPATH + - name: Download LLVM and setup PATH + run: | + brew install llvm + echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH + TMP_PATH=$(xcrun --show-sdk-path)/user/include + echo "CPATH=$TMP_PATH" >> $GITHUB_ENV + echo $CPATH + - name: TEST + run: | + echo $CPATH + llc --version + opt --version - name: build odin run: make release - name: Odin run From 532d307a75ef60a0caff7992e3e197ad07f02ffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikkel=20Hjortsh=C3=B8j?= Date: Thu, 29 Oct 2020 20:06:50 +0100 Subject: [PATCH 7/8] [CI] Remove test stage for macOS and go back to macos-latest --- .github/workflows/ci.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 844a1ef72..219dcebfd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - name: Odin check run: ./odin check examples/demo/demo.odin -vet build_macOS: - runs-on: macos-11.0 + runs-on: macos-latest steps: - uses: actions/checkout@v1 - name: Download LLVM and setup PATH @@ -24,12 +24,6 @@ jobs: echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH TMP_PATH=$(xcrun --show-sdk-path)/user/include echo "CPATH=$TMP_PATH" >> $GITHUB_ENV - echo $CPATH - - name: TEST - run: | - echo $CPATH - llc --version - opt --version - name: build odin run: make release - name: Odin run From d6057a7ec6e3855318b38cc18139306afa870050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikkel=20Hjortsh=C3=B8j?= Date: Thu, 29 Oct 2020 20:10:26 +0100 Subject: [PATCH 8/8] [CI] Fix macOS CPATH for nightly builds --- .github/workflows/nightly.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 2dace6d2a..d43e96b12 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -72,8 +72,9 @@ jobs: - name: Download LLVM and setup PATH run: | brew install llvm - echo ::add-path::/usr/local/opt/llvm/bin - echo ::set-env name=CPATH::`xcrun --show-sdk-path`/usr/include + echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH + TMP_PATH=$(xcrun --show-sdk-path)/user/include + echo "CPATH=$TMP_PATH" >> $GITHUB_ENV - name: build odin run: make release - name: Odin run