From e5fe44dfe182cc0ba3fa84b42c39ca8ea2176a93 Mon Sep 17 00:00:00 2001 From: Eric Kofman Date: Mon, 2 Jun 2025 17:53:43 -0700 Subject: [PATCH 1/4] Create main_macos.yml --- .github/workflows/main_macos.yml | 43 ++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/main_macos.yml diff --git a/.github/workflows/main_macos.yml b/.github/workflows/main_macos.yml new file mode 100644 index 0000000..dd9e93d --- /dev/null +++ b/.github/workflows/main_macos.yml @@ -0,0 +1,43 @@ +name: integration_test_macos + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build-macos: + runs-on: macos-latest + + steps: + - name: Checkout repo + uses: actions/checkout@v2 + + # 1) Install Miniconda (or Mambaforge) on macOS + - name: Setup Miniconda (macOS) + uses: conda-incubator/setup-miniconda@v2 + with: + miniforge-variant: Mambaforge # installs Mamba-enabled Miniforge + python-version: 3.10 # (optional) pins Python 3.10 in base + activate-environment: false # we’ll explicitly create our own env next + auto-update-conda: true + + # 2) Now `conda` and `mamba` are on the PATH + - name: Create Conda Environment (macOS) + run: | + # “setup-miniconda” put `conda` (and `mamba`) in PATH, so we can call it directly. + mamba create -n marine_environment python=3.10 -y + mamba env update -n marine_environment --file marine_environment2.yaml + + - name: Run Integration Tests (macOS) + run: | + # Initialize Conda in bash and activate the env + conda init bash + CONDA_BASE=$(conda info --base) ; source $CONDA_BASE/etc/profile.d/conda.sh + conda activate marine_environment + + # Confirm python path and run tests + which python + cd tests + bash integration_tests_run.sh $(which python) From c0f6395ccc7d445ef1ac27144944c11b973d5586 Mon Sep 17 00:00:00 2001 From: Eric Kofman Date: Mon, 2 Jun 2025 17:55:44 -0700 Subject: [PATCH 2/4] Update main_macos.yml --- .github/workflows/main_macos.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main_macos.yml b/.github/workflows/main_macos.yml index dd9e93d..6dae111 100644 --- a/.github/workflows/main_macos.yml +++ b/.github/workflows/main_macos.yml @@ -14,30 +14,25 @@ jobs: - name: Checkout repo uses: actions/checkout@v2 - # 1) Install Miniconda (or Mambaforge) on macOS - - name: Setup Miniconda (macOS) + - name: Setup Mambaforge (macOS Arm64) uses: conda-incubator/setup-miniconda@v2 with: - miniforge-variant: Mambaforge # installs Mamba-enabled Miniforge - python-version: 3.10 # (optional) pins Python 3.10 in base - activate-environment: false # we’ll explicitly create our own env next + miniforge-variant: Mambaforge # installs Mamba-enabled Miniforge + architecture: arm64 # force the arm64 installer + python-version: 3.10 # (optional) pin base Python + activate-environment: false auto-update-conda: true - # 2) Now `conda` and `mamba` are on the PATH - name: Create Conda Environment (macOS) run: | - # “setup-miniconda” put `conda` (and `mamba`) in PATH, so we can call it directly. + # `mamba` is now on PATH mamba create -n marine_environment python=3.10 -y mamba env update -n marine_environment --file marine_environment2.yaml - name: Run Integration Tests (macOS) run: | - # Initialize Conda in bash and activate the env conda init bash CONDA_BASE=$(conda info --base) ; source $CONDA_BASE/etc/profile.d/conda.sh conda activate marine_environment - - # Confirm python path and run tests - which python cd tests bash integration_tests_run.sh $(which python) From 35670dc05aaf926e1e20fff6779ae40a06a05c1f Mon Sep 17 00:00:00 2001 From: Eric Kofman Date: Mon, 2 Jun 2025 17:57:13 -0700 Subject: [PATCH 3/4] Update main_macos.yml --- .github/workflows/main_macos.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main_macos.yml b/.github/workflows/main_macos.yml index 6dae111..311499d 100644 --- a/.github/workflows/main_macos.yml +++ b/.github/workflows/main_macos.yml @@ -14,22 +14,23 @@ jobs: - name: Checkout repo uses: actions/checkout@v2 - - name: Setup Mambaforge (macOS Arm64) + - name: Setup Mambaforge (macOS arm64) uses: conda-incubator/setup-miniconda@v2 with: - miniforge-variant: Mambaforge # installs Mamba-enabled Miniforge - architecture: arm64 # force the arm64 installer - python-version: 3.10 # (optional) pin base Python + miniforge-variant: Mambaforge + miniforge-version: latest # required when you specify `architecture` + architecture: arm64 + python-version: 3.10 # not 3.1! activate-environment: false auto-update-conda: true - - name: Create Conda Environment (macOS) + - name: Create Conda Environment run: | - # `mamba` is now on PATH + # Now `mamba` is on PATH mamba create -n marine_environment python=3.10 -y mamba env update -n marine_environment --file marine_environment2.yaml - - name: Run Integration Tests (macOS) + - name: Run Integration Tests run: | conda init bash CONDA_BASE=$(conda info --base) ; source $CONDA_BASE/etc/profile.d/conda.sh From 64e5078e08319389e040b110476ee57f740d98e3 Mon Sep 17 00:00:00 2001 From: Eric Kofman Date: Mon, 2 Jun 2025 17:58:15 -0700 Subject: [PATCH 4/4] Update main_macos.yml --- .github/workflows/main_macos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main_macos.yml b/.github/workflows/main_macos.yml index 311499d..9575152 100644 --- a/.github/workflows/main_macos.yml +++ b/.github/workflows/main_macos.yml @@ -18,9 +18,9 @@ jobs: uses: conda-incubator/setup-miniconda@v2 with: miniforge-variant: Mambaforge - miniforge-version: latest # required when you specify `architecture` + miniforge-version: latest architecture: arm64 - python-version: 3.10 # not 3.1! + python-version: 3.10 activate-environment: false auto-update-conda: true