Test branch identical to PR but with less builds

PCMDI · Aug 26, 2024 · 6197090 · 6197090
1 parent a7b6874
commit 6197090
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 25 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -22,8 +22,8 @@ aliases:
     name: setup_miniconda
     command: |
        source $BASH_ENV
-       if [[ $OS == 'osx-64' ]]; then
-          curl -L https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -o miniconda.sh
+       if [[ $OS == 'osx-arm64' ]]; then
+          curl -L https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-arm64.sh -o miniconda.sh
        else
           curl -L https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -o miniconda.sh
        fi
@@ -75,8 +75,8 @@ aliases:
        export ARTIFACT_DIR=`pwd`/artifacts/$OS
        mkdir -p $ARTIFACT_DIR
 
-       if [[ $OS == 'osx-64' ]]; then
-          export OS_NAME="osx_64"
+       if [[ $OS == 'osx-arm64' ]]; then
+          export OS_NAME="osx_arm64"
        else
           export OS_NAME="linux_64"
        fi
@@ -123,12 +123,12 @@ executors:
         CONDA_COMPILERS: "gcc_linux-64 gfortran_linux-64"
    macos:
       macos:
-         xcode: "13.4.1"
-      resource_class: macos.x86.medium.gen2
+         xcode: "15.4.0"
+      resource_class: macos.m1.medium.gen1
       environment:
-        OS: "osx-64"
+        OS: "osx-arm64"
         PROJECT_DIR: "workdir/macos"
-        CONDA_COMPILERS: "clang_osx-64 gfortran_osx-64"
+        CONDA_COMPILERS: "clang_osx-arm64 gfortran_osx-arm64"
 
 jobs:
    build:
@@ -196,8 +196,8 @@ workflows:
          - build:
               matrix:
                  parameters:
-                    os: [ linux ]
-                    python_version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
+                    os: [ linux, macos ]
+                    python_version: [ "3.10" ]
               name: build-<< matrix.os >>-<< matrix.python_version >>
 
          - upload:

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
@@ -1,12 +1,6 @@
 name: CMOR Nightly Build
 run-name: CMOR Nightly Build
-on:
-  push:
-    branches:
-      - "main"
-  pull_request:
-    branches:
-      - "main"
+on: push
 
 jobs:
   nightly:
@@ -21,14 +15,7 @@ jobs:
             C_COMPILER: clang_osx-arm64 
             FORTRAN_COMPILER: gfortran_osx-arm64
             PROJECT_DIR: workdir/macos_arm64
-          - RUNNER_OS: 'macos-13'
-            OS: osx-64
-            OS_NAME: osx_64
-            MINICONDA_INSTALLER_URL: https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
-            C_COMPILER: clang_osx-64 
-            FORTRAN_COMPILER: gfortran_osx-64
-            PROJECT_DIR: workdir/macos_64
-        python_version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python_version: ['3.10']
     runs-on: ${{ matrix.runner.RUNNER_OS }}
     env:
       PACKAGE_NAME: cmor