Merge branch 'main' into dependabot/cargo/reqsign-0.14.3

mozilla · Dec 5, 2023 · bd7e98b · bd7e98b
2 parents 90031df + 920564c
commit bd7e98b
Show file tree

Hide file tree

Showing 30 changed files with 846 additions and 301 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -264,15 +264,15 @@ jobs:
       fail-fast: false
       matrix:
         job:
-          - { os: macos-12 }
-        release: ["13.2"]
+          - { os: ubuntu-22.04 }
     steps:
       - uses: actions/checkout@v4
       - name: Prepare, build and test
-        uses: vmactions/freebsd-vm@v0
+        uses: vmactions/freebsd-vm@v1.0.2
         with:
           mem: 8192
           usesh: true
+          sync: rsync
           copyback: false
           prepare: pkg install -y ca_root_nss curl gmake gtar pot sudo
           run: |
@@ -289,7 +289,7 @@ jobs:
             TEST_USER=tester
             TEST_USER_HOME="/opt/$TEST_USER"
             REPO_NAME=${GITHUB_WORKSPACE##*/}
-            WORKSPACE_PARENT="/Users/runner/work/${REPO_NAME}"
+            WORKSPACE_PARENT="/home/runner/work/${REPO_NAME}"
             WORKSPACE="${WORKSPACE_PARENT}/${REPO_NAME}"
             export WORKSPACE
             #

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,17 @@
+repos:
+-   repo: local
+    hooks:
+    -   id: rust-linting
+        name: Rust linting
+        description: Run cargo fmt on files included in the commit.
+        entry: cargo +nightly fmt --
+        pass_filenames: true
+        types: [file, rust]
+        language: system
+    -   id: rust-clippy
+        name: Rust clippy
+        description: Run cargo clippy on files included in the commit.
+        entry: cargo +nightly clippy --workspace --all-targets --all-features --
+        pass_filenames: false
+        types: [file, rust]
+        language: system