Merge branch 'master' into fix-map_axis-miri

Author: bluss

.github/workflows/ci.yml .github/workflows/ci.yaml.github/workflows/ci.yml renamed to .github/workflows/ci.yaml

@@ -1,8 +1,6 @@
 on:
-  push:
-    branches: [ master ]
   pull_request:
-    branches: [ master ]
+  merge_group:
 
 name: Continuous integration
 
@@ -13,6 +11,21 @@ env:
   RUSTFLAGS: "-D warnings"
 
 jobs:
+  clippy:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        rust:
+          - beta
+    name: clippy/${{ matrix.rust }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.rust }}
+          components: clippy
+      - uses: Swatinem/rust-cache@v2
+      - run: cargo clippy --features docs
   tests:
     runs-on: ubuntu-latest
     strategy:
@@ -23,57 +36,52 @@ jobs:
           - nightly
           - 1.51.0  # MSRV
 
+    name: tests/${{ matrix.rust }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           toolchain: ${{ matrix.rust }}
-          override: true
+      - uses: Swatinem/rust-cache@v2
       - name: Install openblas
         run: sudo apt-get install libopenblas-dev gfortran
       - run: ./scripts/all-tests.sh "$FEATURES" ${{ matrix.rust }}
 
   cross_test:
+    if: ${{ github.event_name == 'merge_group' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
         include:
           - rust: stable
-            target: mips-unknown-linux-gnu
+            target: s390x-unknown-linux-gnu
           - rust: stable
             target: i686-unknown-linux-gnu
 
+    name: cross_test/${{ matrix.target }}/${{ matrix.rust }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           toolchain: ${{ matrix.rust }}
-          target: ${{ matrix.target }}
-          override: true
-      - name: Cache cargo plugins
-        uses: actions/cache@v1
-        with:
-          path: ~/.cargo/bin/
-          key: ${{ runner.os }}-cargo-plugins
+          targets: ${{ matrix.target }}
+      - uses: Swatinem/rust-cache@v2
       - name: Install cross
-        run: cargo install cross || true
+        run: cargo install cross
       - run: ./scripts/cross-tests.sh "docs" ${{ matrix.rust }} ${{ matrix.target }}
 
-  clippy:
+  conclusion:
+    needs:
+      - clippy
+      - tests
+      - cross_test
+    if: always()
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        rust:
-          - beta
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ matrix.rust }}
-          override: true
-          components: clippy
-      - run: cargo clippy --features docs
-
+      - name: Result
+        run: |
+          jq -C <<< "${needs}"
+          # Check if all needs were successful or skipped.
+          "$(jq -r 'all(.result as $result | (["success", "skipped"] | contains([$result])))' <<< "${needs}")"
+        env:
+          needs: ${{ toJson(needs) }}

Cargo.toml

@@ -1,8 +1,9 @@
 [package]
 
 name = "ndarray"
-version = "0.15.4"
+version = "0.15.6"
 edition = "2018"
+rust-version = "1.51"
 authors = [
   "Ulrik Sverdrup \"bluss\"",
   "Jim Turner"
@@ -72,13 +73,15 @@ rayon = ["rayon_", "std"]
 
 matrixmultiply-threading = ["matrixmultiply/threading"]
 
-[profile.release]
 [profile.bench]
 debug = true
+[profile.dev.package.numeric-tests]
+opt-level = 2
+[profile.test.package.numeric-tests]
+opt-level = 2
 
 [workspace]
-members = ["ndarray-rand", "xtest-serialization", "xtest-blas"]
-exclude = ["xtest-numeric"]
+members = ["ndarray-rand", "xtest-serialization", "xtest-blas", "xtest-numeric"]
 
 [package.metadata.release]
 no-dev-version = true