From 3b99e2464d65a7192c2993c2446b13c041d93137 Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 1 May 2024 12:20:52 -0600 Subject: [PATCH 1/6] test ghactions --- .github/workflows/test-cice.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index e7e41de11..d52fe07da 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -1,5 +1,6 @@ name: GHActions + # This workflow is triggered on pushes, pull-requeust, and releases # ghactions* branch names will trigger this to support development testing # To Do: get it working with bash and ubuntu From bb1b2c71f15d902650e629f1d8f5df606c063529 Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 1 May 2024 12:48:39 -0600 Subject: [PATCH 2/6] test ghactions --- .github/workflows/test-cice.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index d52fe07da..211cb1231 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -48,7 +48,7 @@ jobs: sudo xcode-select -r sudo xcode-select -s /Library/Developer/CommandLineTools sudo ln -s /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/* /usr/local/include/ - echo "xcrun --show-sdk-path: $(xcrun --show-sdk-path)" + echo "xcrun --show-sdk-path: $(xcrun -sdk macosx --show-sdk-path)" echo "xcode-select -p: $(xcode-select -p)" - name: system info shell: /bin/bash {0} @@ -65,6 +65,7 @@ jobs: echo "OS: ${{ matrix.os }}" echo "ENVDEF: ${{ matrix.envdef }}" echo "MINICOND: ${{ matrix.minicond }}" + echo "SDKROOT: $SDKROOT" - name : install miniconda shell: /bin/bash {0} run: | From bceedc0bed1c941da8198db418abdeab038d8037 Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 1 May 2024 12:57:18 -0600 Subject: [PATCH 3/6] test ghactions --- .github/workflows/test-cice.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 211cb1231..81a5fa48b 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -50,6 +50,7 @@ jobs: sudo ln -s /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/* /usr/local/include/ echo "xcrun --show-sdk-path: $(xcrun -sdk macosx --show-sdk-path)" echo "xcode-select -p: $(xcode-select -p)" + export SDKROOT=$(xcrun -sdk macos --show-sdk-path) - name: system info shell: /bin/bash {0} run: | From 6a36261a0761054a288c6dfcba4283be278ccb56 Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 1 May 2024 12:58:34 -0600 Subject: [PATCH 4/6] test ghactions --- .github/workflows/test-cice.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 81a5fa48b..9fb27a6cd 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -1,6 +1,5 @@ name: GHActions - # This workflow is triggered on pushes, pull-requeust, and releases # ghactions* branch names will trigger this to support development testing # To Do: get it working with bash and ubuntu @@ -48,9 +47,9 @@ jobs: sudo xcode-select -r sudo xcode-select -s /Library/Developer/CommandLineTools sudo ln -s /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/* /usr/local/include/ - echo "xcrun --show-sdk-path: $(xcrun -sdk macosx --show-sdk-path)" + echo "xcrun --show-sdk-path: $(xcrun --show-sdk-path)" echo "xcode-select -p: $(xcode-select -p)" - export SDKROOT=$(xcrun -sdk macos --show-sdk-path) + export SDKROOT=$(xcrun --show-sdk-path) - name: system info shell: /bin/bash {0} run: | From 2732565c6c944f0bff5a681d507a3dc5d5a99237 Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 1 May 2024 13:13:21 -0600 Subject: [PATCH 5/6] test ghactions --- .github/workflows/test-cice.yml | 1 + configuration/scripts/machines/Macros.conda_macos | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 9fb27a6cd..42e4ca14d 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -50,6 +50,7 @@ jobs: echo "xcrun --show-sdk-path: $(xcrun --show-sdk-path)" echo "xcode-select -p: $(xcode-select -p)" export SDKROOT=$(xcrun --show-sdk-path) + echo "SDKROOT: $SDKROOT" - name: system info shell: /bin/bash {0} run: | diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos index 6f26da0fc..f8b95aa76 100644 --- a/configuration/scripts/machines/Macros.conda_macos +++ b/configuration/scripts/machines/Macros.conda_macos @@ -47,7 +47,8 @@ SDKPATH = $(shell xcrun --show-sdk-path) ifeq ($(strip $(SDKPATH)),) CFLAGS_HOST := else - CFLAGS_HOST = -isysroot $(SDKPATH) + CFLAGS_HOST := -isysroot $(SDKPATH) + CFLAGS += -isysroot $(SDKPATH) LD += -L$(SDKPATH)/usr/lib endif From 55e44d3619a67fd7f4ddd5cea02d1d6f3ab9b96d Mon Sep 17 00:00:00 2001 From: apcraig Date: Wed, 1 May 2024 13:30:19 -0600 Subject: [PATCH 6/6] test ghactions --- .github/workflows/test-cice.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml index 42e4ca14d..20d944d88 100644 --- a/.github/workflows/test-cice.yml +++ b/.github/workflows/test-cice.yml @@ -46,18 +46,15 @@ jobs: run: | sudo xcode-select -r sudo xcode-select -s /Library/Developer/CommandLineTools - sudo ln -s /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/* /usr/local/include/ echo "xcrun --show-sdk-path: $(xcrun --show-sdk-path)" echo "xcode-select -p: $(xcode-select -p)" - export SDKROOT=$(xcrun --show-sdk-path) - echo "SDKROOT: $SDKROOT" - name: system info shell: /bin/bash {0} run: | type wget type curl type csh - echo "readlink \$(which csh): $(python -c 'import os, sys; print os.path.realpath(sys.argv[1])' $(which csh))" + echo "readlink \$(which csh): $(python -c 'import os, sys; print(os.path.realpath(sys.argv[1]))' $(which csh))" echo "csh --version: $(csh --version)" echo "uname -a: $(uname -a)" echo "sw_vers: $(sw_vers)" @@ -66,7 +63,6 @@ jobs: echo "OS: ${{ matrix.os }}" echo "ENVDEF: ${{ matrix.envdef }}" echo "MINICOND: ${{ matrix.minicond }}" - echo "SDKROOT: $SDKROOT" - name : install miniconda shell: /bin/bash {0} run: |