Merge branch 'master' into print-cwd

Author: adamgreig

.github/bors.toml

@@ -1,7 +1,8 @@
 on:
   push:
-    branches: [ staging, trying, master ]
+    branches: [ master ]
   pull_request:
+  merge_group:
 
 name: Continuous integration
 
@@ -14,7 +15,7 @@ jobs:
       matrix:
         rust:
           # MSRV
-          - 1.60.0
+          - "1.70.0"
           - stable
         os: [ubuntu-latest, macos-latest, windows-latest]
         experimental: [false]
@@ -24,54 +25,50 @@ jobs:
             experimental: true
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ matrix.rust }}
-          override: true
-          components: llvm-tools-preview
+      - uses: actions/checkout@v4
+      - name: Setup Rust
+        shell: bash
+        run: |
+          rustup toolchain install ${{ matrix.rust }} --profile minimal
+          rustup default ${{ matrix.rust }}
+          rustup component add llvm-tools clippy rustfmt
+          echo "::add-matcher::.github/workflows/rust.json"
+
+      - name: Clippy
+        run: cargo clippy -- -D warnings
+
+      - name: rustfmt
+        run: cargo fmt --all -- --check
 
       - name: Build and install cargo-binutils
-        uses: actions-rs/cargo@v1
-        with:
-          command: install
-          args: --path . -f
+        if: matrix.rust == 'stable'
+        run: cargo install --path . -f
+
+      - name: Build and install cargo-binutils (--locked)
+        if: matrix.rust != 'stable'
+        run: cargo install --locked --path . -f
 
       - name: Run cargo-nm
-        uses: actions-rs/cargo@v1
-        with:
-          command: nm
-          args: --bin cargo-nm -- --undefined-only
+        run: cargo nm --bin cargo-nm -- --undefined-only
 
       - name: Run cargo-objdump
-        uses: actions-rs/cargo@v1
-        with:
-          command: objdump
-          args: --bin cargo-objdump -- -h
+        run: cargo objdump --bin cargo-objdump -- -h
 
       - name: Run cargo-objcopy (on Linux only)
         if: matrix.os == 'ubuntu-latest'
-        uses: actions-rs/cargo@v1
-        with:
-          command: objcopy
-          args: --bin cargo-objdump -v -- -O binary objdump.bin
+        run: cargo objcopy --bin cargo-objdump -v -- -O binary objdump.bin
 
       - name: Run cargo-size
-        uses: actions-rs/cargo@v1
-        with:
-          command: size
-          args: --bin cargo-size -v
+        run: cargo size --bin cargo-size -v
 
       - name: Run cargo-strip (on Linux only)
         if: matrix.os == 'ubuntu-latest'
-        uses: actions-rs/cargo@v1
-        with:
-          command: strip
-          args: --bin cargo-strip -v
+        run: cargo strip --bin cargo-strip -v
+
   conclusion:
     runs-on: ubuntu-latest
     needs: ci
+    if: always()
     steps:
-      - name: Result
-        run: exit 0
+      - name: Done
+        run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'

.github/workflows/ci.yml

@@ -18,21 +18,16 @@ jobs:
           - { target: x86_64-pc-windows-msvc,   os: windows-latest, suffix: .zip    }
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          target: ${{ matrix.target }}
-          override: true
+      - uses: actions/checkout@v4
+      - name: Setup Rust
+        shell: bash
+        run: |
+          rustup toolchain install stable --profile minimal --target ${{ matrix.target }}
+          rustup default stable
+          echo "::add-matcher::.github/workflows/rust.json"
       - name: Cache Dependencies
-        uses: Swatinem/rust-cache@v1
-        with:
-          key: ${{ matrix.target }}
-      - uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --target ${{ matrix.target }} --release
+        uses: Swatinem/rust-cache@v2
+      - run: cargo build --target ${{ matrix.target }} --release
 
       - name: (Not Windows) Move executables and compress
         if: ${{ matrix.os != 'windows-latest' }}
@@ -53,7 +48,7 @@ jobs:
           }
           Compress-Archive -Path ${{ matrix.target }} -DestinationPath ${{ matrix.target }}.zip
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.target }}
           path: ${{ matrix.target }}${{ matrix.suffix }}
@@ -63,8 +58,8 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
           path: artifacts
       - run: ls -R ./artifacts
@@ -73,11 +68,11 @@ jobs:
         run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
 
       - id: changelog-reader
-        uses: mindsers/changelog-reader-action@v2.0.0
+        uses: mindsers/changelog-reader-action@v2.2.3
         with:
           version: ${{ (github.ref_type == 'tag' && github.ref_name) || 'Unreleased' }}
 
-      - uses: softprops/action-gh-release@v1
+      - uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ steps.changelog-reader.outputs.version }}
           name: ${{ (github.ref_type == 'tag' && steps.changelog-reader.outputs.version) || format('Prereleased {0}', env.CURRENT_DATE) }}

.github/workflows/clippy.yml

@@ -0,0 +1,21 @@
+{
+    "problemMatcher": [
+      {
+        "owner": "rust",
+        "pattern": [
+          {
+            "regexp": "^(warning|warn|error)(\\[(.*)\\])?: (.*)$",
+            "severity": 1,
+            "message": 4,
+            "code": 3
+          },
+          {
+            "regexp": "^([\\s->=]*(.*):(\\d*):(\\d*)|.*)$",
+            "file": 2,
+            "line": 3,
+            "column": 4
+          }
+        ]
+      }
+    ]
+  }

.github/workflows/release.yml

@@ -1,4 +1,3 @@
 **/*.rs.bk
 .#*
 /target
-Cargo.lock

.github/workflows/rust.json

@@ -7,10 +7,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Fixed
+
+- Fixed metadata error when using `--manifest-path` outside of a project folder. 
+
+### Changed
+
+- The `llvm-tools-preview` component was renamed to `llvm-tools`
+
 ### Changed
 
-- MSRV Changed to 1.60
-- Bump `rust-cfg` to 0.5 and `cargo_metadata` to 0.15
+- MSRV Changed to 1.70.0
+- Bump `rust-cfg` to 0.5, `cargo_metadata` to 0.18, `clap` to 4 and `toml` to 0.8
 
 ### Fixed