diff --git a/.github/workflows/all_stages_icd_tests.yml b/.github/workflows/all_stages_icd_tests.yml index a1bc1d0..fb1e8e8 100644 --- a/.github/workflows/all_stages_icd_tests.yml +++ b/.github/workflows/all_stages_icd_tests.yml @@ -19,15 +19,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -50,7 +50,7 @@ jobs: port: 9005 steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: CARTAvis/carta-backend ref: ${{ env.CARTA_BACKEND_BRANCH_NAME }} @@ -91,6 +91,7 @@ jobs: if: matrix.os == 'macos' && matrix.os_version != 'macOS-14' shell: bash run: | + export Protobuf_ROOT="/opt/homebrew/opt/protobuf@21" SRC_DIR=$GITHUB_WORKSPACE/source BUILD_DIR=$GITHUB_WORKSPACE/build cd $SRC_DIR && git submodule update --init @@ -155,15 +156,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -187,7 +188,7 @@ jobs: needs: Build steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: path: ICD-RxJS @@ -235,15 +236,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -290,15 +291,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -345,15 +346,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -400,15 +401,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -455,15 +456,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -510,15 +511,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -565,15 +566,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -620,15 +621,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -675,15 +676,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -730,15 +731,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -785,15 +786,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -840,15 +841,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -895,15 +896,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -950,15 +951,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] diff --git a/.github/workflows/icd_tests.yml b/.github/workflows/icd_tests.yml index f701c23..76d4f20 100644 --- a/.github/workflows/icd_tests.yml +++ b/.github/workflows/icd_tests.yml @@ -48,15 +48,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -79,7 +79,7 @@ jobs: port: 9005 steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: CARTAvis/carta-backend ref: ${{ env.CARTA_BACKEND_BRANCH_NAME }} @@ -120,6 +120,7 @@ jobs: if: matrix.os == 'macos' && matrix.os_version != 'macOS-14' shell: bash run: | + export Protobuf_ROOT="/opt/homebrew/opt/protobuf@21" SRC_DIR=$GITHUB_WORKSPACE/source BUILD_DIR=$GITHUB_WORKSPACE/build cd $SRC_DIR && git submodule update --init @@ -184,15 +185,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -216,7 +217,7 @@ jobs: needs: Build steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: path: ICD-RxJS @@ -264,15 +265,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -320,15 +321,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -376,15 +377,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -432,15 +433,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -488,15 +489,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -544,15 +545,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -600,15 +601,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -656,15 +657,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -712,15 +713,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -768,15 +769,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -824,15 +825,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -880,15 +881,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -936,15 +937,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -992,15 +993,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] diff --git a/.github/workflows/single_stage_icd_tests.yml b/.github/workflows/single_stage_icd_tests.yml index 3f72033..c71883c 100644 --- a/.github/workflows/single_stage_icd_tests.yml +++ b/.github/workflows/single_stage_icd_tests.yml @@ -38,15 +38,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -69,7 +69,7 @@ jobs: port: 9005 steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: CARTAvis/carta-backend ref: ${{ env.CARTA_BACKEND_BRANCH_NAME }} @@ -110,6 +110,7 @@ jobs: if: matrix.os == 'macos' && matrix.os_version != 'macOS-14' shell: bash run: | + export Protobuf_ROOT="/opt/homebrew/opt/protobuf@21" SRC_DIR=$GITHUB_WORKSPACE/source BUILD_DIR=$GITHUB_WORKSPACE/build cd $SRC_DIR && git submodule update --init @@ -174,15 +175,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -206,7 +207,7 @@ jobs: needs: Build steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: path: ICD-RxJS @@ -254,15 +255,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -310,15 +311,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -366,15 +367,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -422,15 +423,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -478,15 +479,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -534,15 +535,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -590,15 +591,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -646,15 +647,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -702,15 +703,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -758,15 +759,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -814,15 +815,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -870,15 +871,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -926,15 +927,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] @@ -982,15 +983,15 @@ jobs: fail-fast: false matrix: include: - - os_version: macOS-13 - os: macos - runner: [macOS-13, ICD] - os_version: macOS-14 os: macos runner: [macOS-14, ICD] - os_version: macOS-15 os: macos runner: [macOS-15, ICD] + - os_version: macOS-26 + os: macos + runner: [macOS-26, ICD] - os_version: ubuntu-22.04 os: linux runner: [self-hosted, Linux, Apptainer, ICD2] diff --git a/src/test/IMAGE_FITTING_BAD.test.ts b/src/test/IMAGE_FITTING_BAD.test.ts index 191b46b..68b1389 100644 --- a/src/test/IMAGE_FITTING_BAD.test.ts +++ b/src/test/IMAGE_FITTING_BAD.test.ts @@ -25,6 +25,7 @@ interface AssertItem { fittingResponseMacOS13M1: CARTA.IFittingResponse[]; fittingResponseMacOS14Intel: CARTA.IFittingResponse[]; fittingResponseMacOS15M1: CARTA.IFittingResponse[]; + fittingResponseMacOS26M1: CARTA.IFittingResponse[]; fittingResponseLinux: CARTA.IFittingResponse[]; precisionDigits: number; } @@ -366,6 +367,45 @@ let assertItem: AssertItem = { message: 'exceeded max number of iterations', }, ], + fittingResponseMacOS26M1: [ + { + resultValues: [ + { + center: { x: 134.7226762659036, y: 280.4762688332016 }, + amp: 0.5436350059500957, + fwhm: { x: 0.7094817008480923, y: 0.12297548397696609 }, + pa: 270.0710593770099, + }, + { + center: { x: 324.35628993697605, y: 324.34845897862266 }, + amp: 9.996890409336245, + fwhm: { x: 29.399585456199773, y: 117.48633742486919 }, + pa: 0.5426721064405485, + }, + ], + resultErrors: [ + { + center: {}, + fwhm: {}, + }, + { + center: { + x: 1.171590888148931e-10, + y: 2.933860676478705e-11, + }, + amp: 2.347629378380985e-11, + fwhm: { + x: 6.904079939171759e-11, + y: 2.759001709565778e-10, + }, + pa: 5.0797230374050426e-11, + }, + ], + success: true, + log: 'Gaussian fitting with 2 component', + message: 'exceeded max number of iterations', + }, + ], fittingResponseRhel8: [ { resultValues: [ @@ -1039,6 +1079,88 @@ describe('IMAGE_FITTING_FITS test: Testing Image Fitting (with and without fov) expect(response.log).toContain(assertItem.fittingResponseMacOS15M1[0].log); expect(response.message).toContain(assertItem.fittingResponseMacOS15M1[0].message); + } else if (Math.floor(MacOSNumber) === 26 && platformOS === 'macOS' && MacChipM1 === true) { + expect(response.resultValues[0].center.x).toBeCloseTo( + assertItem.fittingResponseMacOS26M1[0].resultValues[0].center.x, + assertItem.precisionDigits + ); + expect(response.resultValues[0].center.y).toBeCloseTo( + assertItem.fittingResponseMacOS26M1[0].resultValues[0].center.y, + assertItem.precisionDigits + ); + expect(response.resultValues[0].amp).toBeCloseTo( + assertItem.fittingResponseMacOS26M1[0].resultValues[0].amp, + assertItem.precisionDigits + ); + expect(response.resultValues[0].fwhm.x).toBeCloseTo( + assertItem.fittingResponseMacOS26M1[0].resultValues[0].fwhm.x, + assertItem.precisionDigits + ); + expect(response.resultValues[0].fwhm.y).toBeCloseTo( + assertItem.fittingResponseMacOS26M1[0].resultValues[0].fwhm.y, + assertItem.precisionDigits + ); + expect(response.resultValues[0].pa).toBeCloseTo( + assertItem.fittingResponseMacOS26M1[0].resultValues[0].pa, + assertItem.precisionDigits + ); + expect(response.resultValues[1].center.x).toBeCloseTo( + assertItem.fittingResponseMacOS26M1[0].resultValues[1].center.x, + assertItem.precisionDigits + ); + expect(response.resultValues[1].center.y).toBeCloseTo( + assertItem.fittingResponseMacOS26M1[0].resultValues[1].center.y, + assertItem.precisionDigits + ); + expect(response.resultValues[1].amp).toBeCloseTo( + assertItem.fittingResponseMacOS26M1[0].resultValues[1].amp, + assertItem.precisionDigits + ); + expect(response.resultValues[1].fwhm.x).toBeCloseTo( + assertItem.fittingResponseMacOS26M1[0].resultValues[1].fwhm.x, + assertItem.precisionDigits + ); + expect(response.resultValues[1].fwhm.y).toBeCloseTo( + assertItem.fittingResponseMacOS26M1[0].resultValues[1].fwhm.y, + assertItem.precisionDigits + ); + expect(response.resultValues[1].pa).toBeCloseTo( + assertItem.fittingResponseMacOS26M1[0].resultValues[1].pa, + assertItem.precisionDigits + ); + expect(response.success).toEqual(assertItem.fittingResponseMacOS26M1[0].success); + + expect(response.resultErrors[0].center.x).toBeCloseTo(0); + expect(response.resultErrors[0].center.y).toBeCloseTo(0); + expect(response.resultErrors[0].fwhm.x).toBeCloseTo(0); + expect(response.resultErrors[0].fwhm.y).toBeCloseTo(0); + expect(response.resultErrors[1].center.x).toBeCloseTo( + assertItem.fittingResponseMacOS26M1[0].resultErrors[1].center.x, + assertItem.precisionDigits + ); + expect(response.resultErrors[1].center.y).toBeCloseTo( + assertItem.fittingResponseMacOS26M1[0].resultErrors[1].center.y, + assertItem.precisionDigits + ); + expect(response.resultErrors[1].amp).toBeCloseTo( + assertItem.fittingResponseMacOS26M1[0].resultErrors[1].amp, + assertItem.precisionDigits + ); + expect(response.resultErrors[1].fwhm.x).toBeCloseTo( + assertItem.fittingResponseMacOS26M1[0].resultErrors[1].fwhm.x, + assertItem.precisionDigits + ); + expect(response.resultErrors[1].fwhm.y).toBeCloseTo( + assertItem.fittingResponseMacOS26M1[0].resultErrors[1].fwhm.y, + assertItem.precisionDigits + ); + expect(response.resultErrors[1].pa).toBeCloseTo( + assertItem.fittingResponseMacOS26M1[0].resultErrors[1].pa, + assertItem.precisionDigits + ); + + expect(response.log).toContain(assertItem.fittingResponseMacOS26M1[0].log); + expect(response.message).toContain(assertItem.fittingResponseMacOS26M1[0].message); } else if (platformOS === 'Linux' && isRhel8 === true) { expect(response.resultValues[0].center.x).toBeCloseTo( assertItem.fittingResponseRhel8[0].resultValues[0].center.x, diff --git a/src/test/OPEN_SWAPPED_IMAGES.test.ts b/src/test/OPEN_SWAPPED_IMAGES.test.ts index 9f9de6a..d363523 100644 --- a/src/test/OPEN_SWAPPED_IMAGES.test.ts +++ b/src/test/OPEN_SWAPPED_IMAGES.test.ts @@ -584,7 +584,6 @@ describe('OPEN_SWAPPED_IMAGES test: Testing open swapped images in different axe expect(RasterTileData.length).toEqual(assertItem.addTilesReq[2].tiles.length + 2); expect(RasterTileData.slice(-1)[0].endSync).toEqual(true); msgController.setSpatialRequirements(assertItem.setSpatialRequirements[3]); - msgController.setSpatialRequirements(assertItem.setSpatialRequirements[1]); msgController.setSpatialRequirements(assertItem.setSpatialRequirements[4]); });