From f2d37275ca9282bf519acfa1b94443752aa6a782 Mon Sep 17 00:00:00 2001 From: Paul Gierz Date: Mon, 20 Jan 2025 08:00:48 +0100 Subject: [PATCH 1/9] ci: provision-with-micromamba is deprecated, change workflow to setup-micromamba --- .github/workflows/pyfesom2.yml | 5 ++--- .github/workflows/pyfesom2_onPR.yml | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pyfesom2.yml b/.github/workflows/pyfesom2.yml index ccaea28..2fa2790 100644 --- a/.github/workflows/pyfesom2.yml +++ b/.github/workflows/pyfesom2.yml @@ -37,12 +37,11 @@ jobs: fetch-depth: 0 - name: install conda environment - uses: mamba-org/provision-with-micromamba@main #/v12 + uses: mamba-org/setup-micromamba@v2 with: environment-file: main/ci/requirements-py37.yml environment-name: pyfesom2 - cache-env: true - cache-env-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}" + cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}" # - name: Checkout git commit log # working-directory: pyfesom2 diff --git a/.github/workflows/pyfesom2_onPR.yml b/.github/workflows/pyfesom2_onPR.yml index d5247fd..670185a 100644 --- a/.github/workflows/pyfesom2_onPR.yml +++ b/.github/workflows/pyfesom2_onPR.yml @@ -45,12 +45,11 @@ jobs: fetch-depth: 0 - name: install conda environment - uses: mamba-org/provision-with-micromamba@main #/v12 + uses: mamba-org/setup-micromamba@v2 with: environment-file: main/ci/requirements-py37.yml environment-name: pyfesom2 - cache-env: true - cache-env-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}" + cache-envronment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}" # - name: Checkout git commit log # working-directory: pyfesom2 From 346b32cd7f54380cf079a114453a96c2a338861f Mon Sep 17 00:00:00 2001 From: Paul Gierz Date: Mon, 20 Jan 2025 08:12:45 +0100 Subject: [PATCH 2/9] ci: also init zsh for conda (macos has zsh as default) --- .github/workflows/pyfesom2.yml | 3 +++ .github/workflows/pyfesom2_onPR.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/pyfesom2.yml b/.github/workflows/pyfesom2.yml index 2fa2790..6c4036c 100644 --- a/.github/workflows/pyfesom2.yml +++ b/.github/workflows/pyfesom2.yml @@ -42,6 +42,9 @@ jobs: environment-file: main/ci/requirements-py37.yml environment-name: pyfesom2 cache-environment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}" + init-shell: >- + bash + zsh # - name: Checkout git commit log # working-directory: pyfesom2 diff --git a/.github/workflows/pyfesom2_onPR.yml b/.github/workflows/pyfesom2_onPR.yml index 670185a..466b7d2 100644 --- a/.github/workflows/pyfesom2_onPR.yml +++ b/.github/workflows/pyfesom2_onPR.yml @@ -50,6 +50,9 @@ jobs: environment-file: main/ci/requirements-py37.yml environment-name: pyfesom2 cache-envronment-key: "${{runner.os}}-${{runner.arch}}-py${{env.PYTHON_VERSION}}-${{env.TODAY}}-${{hashFiles(env.CONDA_ENV_FILE)}}" + init-shell: >- + bash + zsh # - name: Checkout git commit log # working-directory: pyfesom2 From cc505752f4f6fa444e92ab5079bc7d9e3c5cf6f5 Mon Sep 17 00:00:00 2001 From: Paul Gierz Date: Mon, 20 Jan 2025 08:30:57 +0100 Subject: [PATCH 3/9] ci: try to fix openssl on macos --- .github/workflows/pyfesom2.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/pyfesom2.yml b/.github/workflows/pyfesom2.yml index 6c4036c..f538197 100644 --- a/.github/workflows/pyfesom2.yml +++ b/.github/workflows/pyfesom2.yml @@ -36,6 +36,11 @@ jobs: path: pyfesom2 fetch-depth: 0 + - name: Update SSL on MacOS + if: matrix.os == 'macos' + run: | + brew install openssl + - name: install conda environment uses: mamba-org/setup-micromamba@v2 with: From cf826e17287927679c3770978a1a339e392bc458 Mon Sep 17 00:00:00 2001 From: Paul Gierz Date: Mon, 20 Jan 2025 08:34:34 +0100 Subject: [PATCH 4/9] ci: forgot the other ci file --- .github/workflows/pyfesom2_onPR.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/pyfesom2_onPR.yml b/.github/workflows/pyfesom2_onPR.yml index 466b7d2..9980033 100644 --- a/.github/workflows/pyfesom2_onPR.yml +++ b/.github/workflows/pyfesom2_onPR.yml @@ -44,6 +44,11 @@ jobs: path: pyfesom2 fetch-depth: 0 + - name: Update SSL on MacOS + if: matrix.os == 'macos' + run: | + brew install openssl + - name: install conda environment uses: mamba-org/setup-micromamba@v2 with: From 639a3dee5e5ca20afac730881f19711a96929583 Mon Sep 17 00:00:00 2001 From: Paul Gierz Date: Mon, 20 Jan 2025 08:38:26 +0100 Subject: [PATCH 5/9] ci: bad syntax on contains macos --- .github/workflows/pyfesom2.yml | 2 +- .github/workflows/pyfesom2_onPR.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pyfesom2.yml b/.github/workflows/pyfesom2.yml index f538197..1db9cb1 100644 --- a/.github/workflows/pyfesom2.yml +++ b/.github/workflows/pyfesom2.yml @@ -37,7 +37,7 @@ jobs: fetch-depth: 0 - name: Update SSL on MacOS - if: matrix.os == 'macos' + if: contains(matrix.os, 'macos') run: | brew install openssl diff --git a/.github/workflows/pyfesom2_onPR.yml b/.github/workflows/pyfesom2_onPR.yml index 9980033..5f5dce2 100644 --- a/.github/workflows/pyfesom2_onPR.yml +++ b/.github/workflows/pyfesom2_onPR.yml @@ -45,7 +45,7 @@ jobs: fetch-depth: 0 - name: Update SSL on MacOS - if: matrix.os == 'macos' + if: contains(matrix.os, 'macos') run: | brew install openssl From 7e2f0d7f88bb32f860a7e7088a99fa046c8fbf8c Mon Sep 17 00:00:00 2001 From: Paul Gierz Date: Mon, 20 Jan 2025 08:48:32 +0100 Subject: [PATCH 6/9] ci: still tryting openssl on mac" --- .github/workflows/pyfesom2.yml | 5 ++++- .github/workflows/pyfesom2_onPR.yml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pyfesom2.yml b/.github/workflows/pyfesom2.yml index 1db9cb1..707f6d2 100644 --- a/.github/workflows/pyfesom2.yml +++ b/.github/workflows/pyfesom2.yml @@ -39,7 +39,10 @@ jobs: - name: Update SSL on MacOS if: contains(matrix.os, 'macos') run: | - brew install openssl + brew update + brew reinstall openssl + ls -l /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib + ln -s /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib /usr/local/lib/ - name: install conda environment uses: mamba-org/setup-micromamba@v2 diff --git a/.github/workflows/pyfesom2_onPR.yml b/.github/workflows/pyfesom2_onPR.yml index 5f5dce2..a39a226 100644 --- a/.github/workflows/pyfesom2_onPR.yml +++ b/.github/workflows/pyfesom2_onPR.yml @@ -47,7 +47,10 @@ jobs: - name: Update SSL on MacOS if: contains(matrix.os, 'macos') run: | - brew install openssl + brew update + brew reinstall openssl + ls -l /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib + ln -s /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib /usr/local/lib/ - name: install conda environment uses: mamba-org/setup-micromamba@v2 From 72872114fe2e4e774a38f182df53cc1742500b0e Mon Sep 17 00:00:00 2001 From: Paul Gierz Date: Mon, 20 Jan 2025 08:52:38 +0100 Subject: [PATCH 7/9] ci: openssl, try 3 --- .github/workflows/pyfesom2.yml | 2 +- .github/workflows/pyfesom2_onPR.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pyfesom2.yml b/.github/workflows/pyfesom2.yml index 707f6d2..f739034 100644 --- a/.github/workflows/pyfesom2.yml +++ b/.github/workflows/pyfesom2.yml @@ -42,7 +42,7 @@ jobs: brew update brew reinstall openssl ls -l /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib - ln -s /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib /usr/local/lib/ + ln -s /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib /usr/lib/ - name: install conda environment uses: mamba-org/setup-micromamba@v2 diff --git a/.github/workflows/pyfesom2_onPR.yml b/.github/workflows/pyfesom2_onPR.yml index a39a226..8050548 100644 --- a/.github/workflows/pyfesom2_onPR.yml +++ b/.github/workflows/pyfesom2_onPR.yml @@ -50,7 +50,7 @@ jobs: brew update brew reinstall openssl ls -l /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib - ln -s /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib /usr/local/lib/ + ln -s /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib /usr/lib/ - name: install conda environment uses: mamba-org/setup-micromamba@v2 From 603831cbb32d7ebcd3348fb0b3ff5effb47aa359 Mon Sep 17 00:00:00 2001 From: Paul Gierz Date: Mon, 20 Jan 2025 08:56:39 +0100 Subject: [PATCH 8/9] ci: openssl, try 4 --- .github/workflows/pyfesom2.yml | 6 ++++-- .github/workflows/pyfesom2_onPR.yml | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pyfesom2.yml b/.github/workflows/pyfesom2.yml index f739034..4e301f7 100644 --- a/.github/workflows/pyfesom2.yml +++ b/.github/workflows/pyfesom2.yml @@ -41,8 +41,10 @@ jobs: run: | brew update brew reinstall openssl - ls -l /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib - ln -s /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib /usr/lib/ + sudo mkdir -p /usr/local/lib + sudo ln -s /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib /usr/local/lib/ + sudo mkdir -p /usr/lib + sudo ln -s /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib /usr/lib/ - name: install conda environment uses: mamba-org/setup-micromamba@v2 diff --git a/.github/workflows/pyfesom2_onPR.yml b/.github/workflows/pyfesom2_onPR.yml index 8050548..93eb278 100644 --- a/.github/workflows/pyfesom2_onPR.yml +++ b/.github/workflows/pyfesom2_onPR.yml @@ -50,7 +50,10 @@ jobs: brew update brew reinstall openssl ls -l /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib - ln -s /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib /usr/lib/ + sudo mkdir -p /usr/local/lib + sudo ln -s /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib /usr/local/lib/ + sudo mkdir -p /usr/lib + sudo ln -s /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib /usr/lib/ - name: install conda environment uses: mamba-org/setup-micromamba@v2 From d6b77654441424bed20deadd864505b81e6f817f Mon Sep 17 00:00:00 2001 From: Paul Gierz Date: Mon, 20 Jan 2025 08:59:42 +0100 Subject: [PATCH 9/9] ci: openssl, try 5 --- .github/workflows/pyfesom2.yml | 4 +--- .github/workflows/pyfesom2_onPR.yml | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pyfesom2.yml b/.github/workflows/pyfesom2.yml index 4e301f7..e870088 100644 --- a/.github/workflows/pyfesom2.yml +++ b/.github/workflows/pyfesom2.yml @@ -42,9 +42,7 @@ jobs: brew update brew reinstall openssl sudo mkdir -p /usr/local/lib - sudo ln -s /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib /usr/local/lib/ - sudo mkdir -p /usr/lib - sudo ln -s /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib /usr/lib/ + sudo ln -sv /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib /usr/local/lib/ - name: install conda environment uses: mamba-org/setup-micromamba@v2 diff --git a/.github/workflows/pyfesom2_onPR.yml b/.github/workflows/pyfesom2_onPR.yml index 93eb278..78cdfdf 100644 --- a/.github/workflows/pyfesom2_onPR.yml +++ b/.github/workflows/pyfesom2_onPR.yml @@ -51,9 +51,7 @@ jobs: brew reinstall openssl ls -l /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib sudo mkdir -p /usr/local/lib - sudo ln -s /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib /usr/local/lib/ - sudo mkdir -p /usr/lib - sudo ln -s /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib /usr/lib/ + sudo ln -vs /opt/homebrew/opt/openssl/lib/libcrypto.3.dylib /usr/local/lib/ - name: install conda environment uses: mamba-org/setup-micromamba@v2