Merge branch 'master' into next

Author: Stebalien

.github/actions/rust-cargo-run/action.yml

@@ -0,0 +1,12 @@
+name: Cargo audit
+on:
+  push:
+
+jobs:
+  security_audit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions-rs/audit-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/audit.yml

@@ -6,6 +6,7 @@ on:
       - master
       - next
   pull_request:
+  merge_group:
 
 env:
   RUSTFLAGS: -Dwarnings
@@ -15,44 +16,46 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checking out
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Running rustfmt
       run: make rustfmt
 
   check-clippy:
     runs-on: ubuntu-latest
     steps:
     - name: Checking out
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Running clippy
       run: make check
 
   test:
     runs-on: ubuntu-latest
     steps:
     - name: Checking out
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
+    - name: Setting up cache
+      uses: pl-strflt/rust-sccache-action@v1
+      env:
+        SCCACHE_CACHE_SIZE: 2G
+        SCCACHE_DIR: ${{ github.workspace }}/.cache/sccache
     - name: Running tests
-      uses: ./.github/actions/rust-cargo-run
-      with:
-        command: test
-        args: --locked --all --no-fail-fast --exclude=fil_builtin_actors_bundle
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        save_cache: true
+      run: |
+        cargo test --locked --all --no-fail-fast --exclude=fil_builtin_actors_bundle
 
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        network: [ 'mainnet', 'caterpillarnet', 'butterflynet', 'calibrationnet', 'devnet', 'testing', 'testing-fake-proofs', 'wallaby', 'hyperspace', 'devnet-wasm' ]
+        network: [ 'mainnet', 'caterpillarnet', 'butterflynet', 'calibrationnet', 'devnet', 'testing', 'testing-fake-proofs', 'wallaby', 'devnet-wasm' ]
     steps:
     - name: Checking out
-      uses: actions/checkout@v2
-    - name: Install Rust toolchain
-      uses: ./.github/actions/rust-cargo-run
-      with:
-        command: version
-        github_token: ${{ secrets.GITHUB_TOKEN }}
+      uses: actions/checkout@v3
+    - name: Setting up cache
+      uses: pl-strflt/rust-sccache-action@v1
+      env:
+        SCCACHE_CACHE_SIZE: 2G
+        SCCACHE_DIR: ${{ github.workspace }}/.cache/sccache
+        CACHE_SKIP_SAVE: true
     - name: Writing bundle
       env:
         BUILD_FIL_NETWORK: ${{ matrix.network }}
@@ -68,17 +71,16 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
     - name: Checking out
-      uses: actions/checkout@v2
-    - name: Install Rust toolchain
-      uses: ./.github/actions/rust-cargo-run
+      uses: actions/checkout@v3
+    - name: Setting up cache
+      uses: pl-strflt/rust-sccache-action@v1
+      env:
+        SCCACHE_CACHE_SIZE: 2G
+        SCCACHE_DIR: ${{ github.workspace }}/.cache/sccache
       with:
-        command: version
-        components: llvm-tools-preview
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        cache_name: cov
-        save_cache: true
+        shared-key: coverage
     - name: Put LLVM tools into the PATH
-      run: echo "${HOME}/.rustup/toolchains/$(cat rust-toolchain)-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin" >> $GITHUB_PATH
+      run: echo "$(rustc --print sysroot)/lib/rustlib/x86_64-unknown-linux-gnu/bin" >> $GITHUB_PATH
     - name: Install demangler
       run: cargo install rustfilt
     - name: Create coverage report
@@ -109,6 +111,6 @@ jobs:
         name: code-coverage-report
         path: llvm-show/*
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@81cd2dc8148241f03f5839d295e000b8f761e378 # v3.1.0
+      uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
       with:
         files: lcov.info

.github/workflows/ci.yml

@@ -2,5 +2,6 @@ target
 *.wat
 *.wasm
 .idea/
+.vscode/
 **/.DS_Store
 output/*.car