From 70b0356780d2e5c2e471364ccfcef105d3b3ff54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franz=20P=C3=B6schel?= <franz.poeschel@gmail.com>
Date: Thu, 25 Aug 2022 14:50:52 +0200
Subject: [PATCH] Use appleclang test for testing new layout

---
 .github/workflows/linux.yml | 8 ++++----
 .github/workflows/macos.yml | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 6c35b3aab1..07b55a657c 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -82,7 +82,7 @@ jobs:
         export OPENPMD_BP_BACKEND=ADIOS1
         ctest --test-dir build --output-on-failure
 
-  clang7_nopy_ompi_h5_ad1_ad2_newLayout:
+  clang7_nopy_ompi_h5_ad1_ad2:
     runs-on: ubuntu-20.04
     if: github.event.pull_request.draft == false
     steps:
@@ -96,7 +96,7 @@ jobs:
         sudo apt-get install clang-7 gfortran libopenmpi-dev python3
         sudo .github/workflows/dependencies/install_spack
     - name: Build
-      env: {CC: clang-7, CXX: clang++-7, CXXFLAGS: -Werror, OPENPMD2_ADIOS2_SCHEMA: 20210209}
+      env: {CC: clang-7, CXX: clang++-7, CXXFLAGS: -Werror}
       run: |
         eval $(spack env activate --sh .github/ci/spack-envs/clang7_nopy_ompi_h5_ad1_ad2/)
         spack install
@@ -148,7 +148,7 @@ jobs:
         ctest --test-dir build --output-on-failure
 
   # ADIOS2 v2.7.1
-  clang8_py38_mpich_h5_ad1_ad2_newLayout:
+  clang8_py38_mpich_h5_ad1_ad2:
     runs-on: ubuntu-20.04
     if: github.event.pull_request.draft == false
     steps:
@@ -162,7 +162,7 @@ jobs:
         sudo apt-get install clang-8 gfortran libmpich-dev python3
         sudo .github/workflows/dependencies/install_spack
     - name: Build
-      env: {CC: clang-8, CXX: clang++-8, CXXFLAGS: -Werror, OPENPMD2_ADIOS2_SCHEMA: 20210209}
+      env: {CC: clang-8, CXX: clang++-8, CXXFLAGS: -Werror}
       run: |
         cmake --version
         mpiexec --version
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 40528ae36e..af81317601 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -42,6 +42,7 @@ jobs:
           -DopenPMD_USE_INVASIVE_TESTS=ON
         cmake --build build --parallel 2
         ctest --test-dir build --output-on-failure
+        OPENPMD2_ADIOS2_SCHEMA=20220726 ctest --test-dir build --output-on-failure
 
 # TODO: apple_conda_ompi_all (similar to conda_ompi_all on Linux)
 #   both OpenMPI and MPICH cause startup (MPI_Init) issues on GitHub Actions