Merge branch 'main' into allow-using-large-pages-in-profiler

spacemeshos · Jul 9, 2024 · 88d89a7 · 88d89a7
2 parents 901f4d6 + 5771cbe
commit 88d89a7
Show file tree

Hide file tree

Showing 44 changed files with 2,805 additions and 1,489 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,9 @@
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "cargo"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: dtolnay/rust-toolchain@1.74.1
+      - uses: dtolnay/rust-toolchain@1.78
       - uses: Swatinem/rust-cache@v2
       - run: cargo check --workspace --all-features
 
@@ -28,17 +28,17 @@ jobs:
     needs:
       - check
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 15
     strategy:
       fail-fast: false
       matrix:
         include:
           - os: [self-hosted, linux, x64, intel]
-            runner: self-hosted-linux-intel
-          - os: [self-hosted, linux, arm64]
+          - os: ubuntu-latest-arm-8-cores
             rustflags: --cfg=aes_armv8
           - os: [self-hosted, macos, arm64]
             rustflags: --cfg=aes_armv8
-          - os: macos-latest
+          - os: macos-13
             toolchain: stable
           - os: windows-2019
 
@@ -49,8 +49,8 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: dtolnay/rust-toolchain@1.74.1
-      - if: matrix.runner == 'self-hosted-linux-intel'
+      - uses: dtolnay/rust-toolchain@1.78
+      - if: matrix.os == 'ubuntu-latest-arm-8-cores'
         run: sudo apt-get update && sudo apt-get install -y libpocl2 pocl-opencl-icd ocl-icd-opencl-dev
         name: Install dependencies for testing openCL on Linux
       - if: matrix.os == 'windows-2019'
@@ -62,18 +62,13 @@ jobs:
       - uses: Swatinem/rust-cache@v2
 
       - name: Tests
-        run: cargo test --all-features --release -p post-rs -p certifier -p service
+        run: cargo test --workspace --exclude scrypt-ocl
         env:
           RUSTFLAGS: ${{ matrix.rustflags }}
 
       - name: Test scrypt-ocl crate
         if: matrix.os != 'windows-2019'
-        run: cargo test -p scrypt-ocl --all-features --release -- --test-threads=1
-        env:
-          RUSTFLAGS: ${{ matrix.rustflags }}
-
-      - name: Test ffi crate
-        run: cargo test -p post-cbindings --all-features --release -- --test-threads=1
+        run: cargo test -p scrypt-ocl -- --test-threads=1
         env:
           RUSTFLAGS: ${{ matrix.rustflags }}
 
@@ -84,7 +79,7 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: dtolnay/rust-toolchain@1.74.1
+      - uses: dtolnay/rust-toolchain@1.78
         with:
           components: rustfmt
       - uses: Swatinem/rust-cache@v2
@@ -122,13 +117,13 @@ jobs:
         with:
           submodules: true
       - name: Install stable
-        uses: dtolnay/rust-toolchain@1.74.1
+        uses: dtolnay/rust-toolchain@1.78
         with:
           components: llvm-tools-preview
       - name: cargo install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
       - name: cargo llvm-cov
-        run: cargo llvm-cov --locked --all-features --lcov --output-path lcov.info --workspace --ignore-filename-regex "main.rs" -- --test-threads=1
+        run: cargo llvm-cov --locked --lcov --output-path lcov.info --workspace --ignore-filename-regex "main.rs" -- --test-threads=1
       - name: Upload to codecov.io
         uses: codecov/codecov-action@v3
         with:
@@ -145,12 +140,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
+          - os: [self-hosted, linux, x64, intel]
             dylib: libpost.so
             staticlib: libpost.a
             artifact-name: linux
 
-          - os: [self-hosted, linux, arm64]
+          - os: ubuntu-latest-arm-8-cores
             dylib: libpost.so
             staticlib: libpost.a
             rustflags: --cfg=aes_armv8
@@ -162,7 +157,7 @@ jobs:
             rustflags: --cfg=aes_armv8
             artifact-name: macos-m1
 
-          - os: macos-latest
+          - os: macos-13
             dylib: libpost.dylib
             staticlib: libpost.a
             artifact-name: macos
@@ -172,16 +167,16 @@ jobs:
             staticlib: post.lib
             artifact-name: windows
     steps:
-      - if: matrix.os == 'ubuntu-latest'
-        run: sudo apt-get install -y ocl-icd-opencl-dev
+      - if: matrix.os == 'ubuntu-latest-arm-8-cores'
+        run: sudo apt-get update && sudo apt-get install -y ocl-icd-opencl-dev
         name: Install opencl
       - if: matrix.os == 'windows-2019'
         name: Install opencl
         run: vcpkg install opencl
       - uses: actions/checkout@v3
         with:
           submodules: true
-      - uses: dtolnay/rust-toolchain@1.74.1
+      - uses: dtolnay/rust-toolchain@1.78
       - uses: Swatinem/rust-cache@v2
         with:
           key: ${{ join( matrix.os, '-' ) }}
@@ -203,7 +198,7 @@ jobs:
       - name: Archive production artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: libpost-${{ matrix.artifact-name }}${{ steps.version.output.suffix }}
+          name: libpost-${{ matrix.artifact-name }}${{ steps.version.outputs.suffix }}
           path: |
             ffi/post.h
             target/release-clib/${{ matrix.dylib }}
@@ -217,7 +212,7 @@ jobs:
       - name: Archive profiler artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: profiler-${{ matrix.artifact-name }}${{ steps.version.output.suffix }}
+          name: profiler-${{ matrix.artifact-name }}${{ steps.version.outputs.suffix }}
           path: |
             target/release/profiler${{ matrix.os == 'windows-2019' && '.exe' || '' }}
           if-no-files-found: error
@@ -232,9 +227,9 @@ jobs:
       - name: Archive service artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: service-${{ matrix.artifact-name }}${{ steps.version.output.suffix }}
+          name: post-service-${{ matrix.artifact-name }}${{ steps.version.outputs.suffix }}
           path: |
-            target/release/service${{ matrix.os == 'windows-2019' && '.exe' || '' }}
+            target/release/post-service${{ matrix.os == 'windows-2019' && '.exe' || '' }}
           if-no-files-found: error
 
   release: