Merge branch 'main' into josh-fbals

Author: Einar Rasmussen

.github/workflows/op_rbuilder_checks.yaml

@@ -12,17 +12,8 @@ env:
 
 jobs:
   lint_and_test:
-    name: Lint and test
+    name: Lint and test (nightly)
     runs-on: warp-ubuntu-latest-x64-16x
-    env:
-      # Set features for the Makefile
-      FEATURES: ${{ matrix.features }}
-    strategy:
-      matrix:
-        toolchain:
-          - nightly
-        features:
-          - ""
 
     steps:
       - name: Checkout sources
@@ -32,7 +23,7 @@ jobs:
       - name: Setup rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: ${{ matrix.toolchain }}
+          toolchain: nightly
           components: "rustfmt,clippy"
 
       # https://github.com/swatinem/rust-cache
@@ -53,6 +44,9 @@ jobs:
           echo "SCCACHE_GHA_ENABLED=true" >> $GITHUB_ENV
           echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
 
+      - name: Install cargo-nextest
+        uses: taiki-e/install-action@nextest
+
       - name: Install Foundry toolchain
         uses: foundry-rs/foundry-toolchain@v1
         with:

.github/workflows/release-plz.yaml

@@ -1,10 +1,6 @@
 name: Release-plz
 
 on:
-  # Create/update release PR on main push
-  push:
-    branches:
-      - main
   # Create tags when release PR is merged
   pull_request:
     types:
@@ -18,7 +14,10 @@ permissions:
 
 jobs:
   release-plz:
-    name: Release-plz
+    name: Create release tags
+    if: |
+      github.event.pull_request.merged == true &&
+      contains(github.event.pull_request.labels.*.name, 'release')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -30,20 +29,7 @@ jobs:
       - name: Install Rust toolchain
         uses: dtolnay/rust-toolchain@stable
 
-      - name: Run release-plz release-pr
-        if: github.event_name == 'push' && github.ref_type == 'branch'
-        uses: release-plz/action@v0.5
-        with:
-          command: release-pr
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Create tags on release PR merge
-        if: >-
-          github.event_name == 'pull_request' &&
-          github.event.pull_request.merged == true &&
-          contains(github.event.pull_request.labels.*.name, 'release') &&
-          github.event.pull_request.user.login == 'github-actions[bot]'
         uses: release-plz/action@v0.5
         with:
           command: release