various updates

.circleci/config.yml

@@ -1,10 +1,10 @@
 version: 2.1
 orbs:
-  rust: circleci/rust@1.6.0
+  rust: circleci/rust@1.6.1
 
 workflows:
   production:
     jobs:
       - rust/lint-test-build:
           release: true
-          version: 1.56.1
+          version: 1.79.0

.github/workflows/ci.yml

@@ -1,8 +1,12 @@
 name: ci
 on:
   push:
-    branches-ignore:
-      - '**.tmp'
+    branches: 
+      - "master"
+    tags:
+      - "*"
+  pull_request:
+
 jobs:
   build:
     name: Build and test
@@ -13,96 +17,64 @@ jobs:
         rust_version: [beta]
     env:
       BUILD_ID_LEN: 20
-      RUST_LOG: trace
+      RUST_LOG: debug 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: ${{ matrix.rust_version }}
-          profile: minimal
           components: clippy
 
-      - uses: Swatinem/rust-cache@v1
-
       - run: cargo install cargo-hack
 
       - name: Clippy
-        uses: actions-rs/cargo@v1
-        with:
-          command: hack
-          args: --feature-powerset clippy -- -D warnings
+        run: cargo hack --feature-powerset clippy -- -D warnings
 
       - name: Build
         # NOTE: we don't feature-powerset here because we need to provide
         # symbols for some of the specific lookup mechanisms
         # NOTE: we don't build the entire workspace because
         # buildid-linker-symbols does not work on all platforms (for example,
         # it fails on macos)
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --all-targets
+        run: cargo build --all-targets
 
       - name: Test
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --all-targets
-
-      - name: Test (GNU extras)
-        uses: actions-rs/cargo@v1
-        if: ${{ matrix.os }} == ubuntu-latest
-        with:
-          command: test
-          args: -p buildid-tests-linker-symbols
+        run: cargo test --all-targets
 
   check:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - name: Install Rust toolchain
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          profile: minimal
           toolchain: beta
-          override: true
           components: rustfmt, clippy
 
-      - uses: Swatinem/rust-cache@v1
-
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-
-      - uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: -- -D warnings
+      - run: cargo fmt --all -- --check
+      - run: cargo clippy --all --all-targets -- -D warnings
 
   test-specific:
     env:
-      RUST_LOG: trace
+      RUST_LOG: debug
     strategy:
       matrix:
         os: [ubuntu-latest]
         rust_version: [beta]
-        script: [test-gnu-ld, test-gnu-ld-section-inject, test-gnu-ld-symbol-start-end, test-gnu-ld-symbol-start-end-no-lds]
+        script: [test-gnu-ld, test-gnu-ld-symbol-start-end]
 
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: ${{ matrix.rust_version }}
-          profile: minimal
-
-      - uses: Swatinem/rust-cache@v1
 
       - run: ./scripts/${{ matrix.script }}

.github/workflows/nix.yml

@@ -2,6 +2,10 @@ name: check with nix
 
 on:
   push:
+    branches: 
+      - "master"
+    tags:
+      - "*"
   pull_request:
 
 jobs:
@@ -24,10 +28,6 @@ jobs:
         run: |
           nix develop --command \
             cargo fmt --check
-      - name: Audit Rust code
-        run: |
-          nix develop --command \
-            cargo-deny check
       - name: editorconfig check
         run: |
           nix develop --command \
@@ -45,7 +45,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-22.04, macos-12]
-    runs-on: ubuntu-22.04
+    runs-on: ${{ matrix.os }}
     steps:
       - name: git checkout
         uses: actions/checkout@v4
@@ -61,8 +61,14 @@ jobs:
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
             target/
-          key: cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: cargo-${{ matrix.os }}-${{ hashFiles('**/Cargo.lock') }}
+      - name: Test
+        if: "matrix.os == 'ubuntu-22.04'"
+        run: |
+          nix develop --command \
+            env RUSTFLAGS="-Clink-arg=-Wl,--build-id" cargo test
       - name: Test
+        if: "matrix.os != 'ubuntu-22.04'"
         run: |
           nix develop --command \
             cargo test