diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 123e03987..f12c7653f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: sys: - {compiler: gcc, version: '11', name: c++17, flags: -DCPP17=ON} - {compiler: clang, version: '15', name: assert, flags: -DXTENSOR_ENABLE_ASSERT=ON} - - {compiler: clang, version: '16', name: column-major, flags: -DDEFAULT_COLUMN_MAJOR=ON} + - {compiler: clang, version: '15', name: column-major, flags: -DDEFAULT_COLUMN_MAJOR=ON} defaults: run: diff --git a/.github/workflows/ci_extended.yaml b/.github/workflows/ci_extended.yaml index ee4083707..92a7de316 100644 --- a/.github/workflows/ci_extended.yaml +++ b/.github/workflows/ci_extended.yaml @@ -54,52 +54,6 @@ jobs: working-directory: build run: cmake --install . - - name: Build - working-directory: build - run: cmake --build . - - - name: Run tests - working-directory: build - run: ctest --output-on-failure - - clang: - - strategy: - fail-fast: false - matrix: - runs-on: [windows-latest] - - defaults: - run: - shell: bash -l {0} - - name: ${{ matrix.runs-on }} • clang - default - runs-on: ${{ matrix.runs-on }} - steps: - - - name: Setup clang - run: | - echo "CC=clang" >> $GITHUB_ENV - echo "CXX=clang++" >> $GITHUB_ENV - - - name: Checkout code - uses: actions/checkout@v3 - - - name: Set conda environment - uses: mamba-org/provision-with-micromamba@main - with: - environment-name: myenv - environment-file: environment-dev.yml - extra-specs: | - sel(win): ninja - - - name: Configure using CMake - run: cmake -Bbuild -DCMAKE_INSTALL_PREFIX=$CONDA_PREFIX -DBUILD_TESTS=ON -G Ninja ${{ matrix.sys.flags }} - - - name: Install - working-directory: build - run: cmake --install . - - name: Build working-directory: build run: cmake --build . --target test_xtensor_lib --parallel 8