diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 46e5cda..2994d85 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -46,17 +46,17 @@ jobs: cmake --version cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=ON .. - - uses: actions/upload-artifact@v5 + - uses: actions/upload-artifact@v6 if: failure() with: name: ${{ format('Ubuntu {0}', matrix.UBUNTU_VERSION) }} CMakeCache path: ${{ env.FANS_BUILD_DIR }}/CMakeCache.txt - - uses: actions/upload-artifact@v5 + - uses: actions/upload-artifact@v6 if: failure() with: name: ${{ format('Ubuntu {0}', matrix.UBUNTU_VERSION) }} CMakeLogs path: '${{ env.FANS_BUILD_DIR }}/CMakeFiles/*.log' - - uses: actions/upload-artifact@v5 + - uses: actions/upload-artifact@v6 if: failure() with: name: ${{ format('Ubuntu {0}', matrix.UBUNTU_VERSION) }} CompileCommands @@ -75,7 +75,7 @@ jobs: run: | su -c "ctest" ${{ env.FANS_MPI_USER }} - - uses: actions/upload-artifact@v5 + - uses: actions/upload-artifact@v6 if: failure() with: name: ${{ format('Ubuntu {0}', matrix.UBUNTU_VERSION) }} CTest logs @@ -87,7 +87,7 @@ jobs: - name: Run pytest checks on HDF5 output run: pixi run -e dashboard pytest - - uses: actions/upload-artifact@v5 + - uses: actions/upload-artifact@v6 if: failure() with: name: ${{ format('Ubuntu {0}', matrix.UBUNTU_VERSION) }} PyTest logs diff --git a/.github/workflows/pixi_build.yaml b/.github/workflows/pixi_build.yaml index aca9b10..412235e 100644 --- a/.github/workflows/pixi_build.yaml +++ b/.github/workflows/pixi_build.yaml @@ -31,12 +31,12 @@ jobs: run: pixi run test - name: Upload test logs - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: ${{ matrix.os }} test-logs path: test/output/*.log - - uses: actions/upload-artifact@v5 + - uses: actions/upload-artifact@v6 if: failure() with: name: ${{ matrix.os }} PyTest logs diff --git a/pixi.lock b/pixi.lock index ea573cb..a1b4345 100644 --- a/pixi.lock +++ b/pixi.lock @@ -3,6 +3,8 @@ environments: dashboard: channels: - url: https://conda.anaconda.org/conda-forge/ + options: + pypi-prerelease-mode: if-necessary-or-explicit packages: linux-64: - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 @@ -1454,6 +1456,8 @@ environments: default: channels: - url: https://conda.anaconda.org/conda-forge/ + options: + pypi-prerelease-mode: if-necessary-or-explicit packages: linux-64: - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 @@ -1852,7 +1856,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/zstandard-0.25.0-py314h0f05182_1.conda - conda: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.7-hb8e6e7a_2.conda - conda: . - build: h04f5b5a_0 + build: h1235946_0 linux-aarch64: - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/_openmp_mutex-4.5-2_gnu.tar.bz2 - conda: https://conda.anaconda.org/conda-forge/noarch/_python_abi3_support-1.0-hd8ed1ab_2.conda @@ -2943,10 +2947,12 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-arm64/zstandard-0.25.0-py314h9d33bd4_1.conda - conda: https://conda.anaconda.org/conda-forge/osx-arm64/zstd-1.5.7-h6491c7d_2.conda - conda: . - subdir: osx-arm64 + build: hcb8d3e5_0 dev: channels: - url: https://conda.anaconda.org/conda-forge/ + options: + pypi-prerelease-mode: if-necessary-or-explicit packages: linux-64: - conda: https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2 @@ -6119,8 +6125,11 @@ packages: - conda: . name: fans version: 0.6.1 - build: h04f5b5a_0 + build: h1235946_0 subdir: linux-64 + variants: + cxx_compiler: clangxx + target_platform: linux-64 depends: - libstdcxx >=15 - libgcc >=15 @@ -6128,7 +6137,7 @@ packages: - fftw >=3.3.10,<4.0a0 - fftw * mpi_openmpi_* input: - hash: 81734781fed742a3ee906fd6767759243525440b3f419cd0622b90e4d0f107fe + hash: 16dd9c1131985cbcdb3bb37c6672fa20ea368188987b8d42da1b2ebd02bd9fbf globs: [] - conda: . name: fans @@ -6160,15 +6169,18 @@ packages: - conda: . name: fans version: 0.6.1 - build: hbf21a9e_0 + build: hcb8d3e5_0 subdir: osx-arm64 + variants: + cxx_compiler: clangxx + target_platform: osx-arm64 depends: - libcxx >=21 - hdf5 >=1.14.6,<1.14.7.0a0 mpi_openmpi_* - fftw >=3.3.10,<4.0a0 - fftw * mpi_openmpi_* input: - hash: 8ad54598e221efef736cec65db9e327856f556e55f81445cda5620e181ef8813 + hash: 16dd9c1131985cbcdb3bb37c6672fa20ea368188987b8d42da1b2ebd02bd9fbf globs: [] - conda: https://conda.anaconda.org/conda-forge/linux-64/fftw-3.3.10-mpi_openmpi_h99e62ba_10.conda sha256: 59a1fd0daa71bd5529e19b4da8aae2ded4d4ef05e5e31d80c39cbe2fc7664b6a diff --git a/pixi.toml b/pixi.toml index 2d25fe1..45b9abd 100644 --- a/pixi.toml +++ b/pixi.toml @@ -58,6 +58,7 @@ extra-args = [ ] [workspace.target.osx-arm64.build-variants] +cxx_compiler = ["clangxx"] [workspace.target.linux-64.build-variants] cxx_compiler = ["clangxx"]