[pull] master from rust-lang:master

.github/workflows/main.yml

@@ -1,5 +1,7 @@
 name: CI
-on: [push, pull_request]
+on:
+  pull_request:
+  merge_group:
 
 jobs:
   test:
@@ -26,13 +28,15 @@ jobs:
             rust: stable
     steps:
     - uses: actions/checkout@master
+      with:
+        submodules: true
     - name: Install Rust (rustup)
       run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }}
       shell: bash
-    - run: cargo test --no-default-features
-    - run: cargo test
-    - run: cargo run --manifest-path systest/Cargo.toml
-    - run: cargo test --manifest-path git2-curl/Cargo.toml
+    - run: cargo test --locked
+    - run: cargo test --features https,ssh
+    - run: cargo run -p systest
+    - run: cargo test -p git2-curl
 
   rustfmt:
     name: Rustfmt
@@ -42,3 +46,20 @@ jobs:
     - name: Install Rust
       run: rustup update stable && rustup default stable && rustup component add rustfmt
     - run: cargo fmt -- --check
+
+  # The success job is here to consolidate the total success/failure state of
+  # all other jobs. This job is then included in the GitHub branch protection
+  # rule which prevents merges unless all other jobs are passing. This makes
+  # it easier to manage the list of jobs via this yml file and to prevent
+  # accidentally adding new jobs without also updating the branch protections.
+  success:
+    name: Success gate
+    if: always()
+    needs:
+      - test
+      - rustfmt
+    runs-on: ubuntu-latest
+    steps:
+      - run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'
+      - name: Done
+        run: exit 0

.github/workflows/publish.yml

@@ -0,0 +1,35 @@
+name: Publish
+on:
+  workflow_dispatch:
+    inputs:
+      git2:
+        description: "Publish git2"
+        type: boolean
+        default: true
+      git2_curl:
+        description: "Publish git2-curl"
+        type: boolean
+        default: true
+      libgit2_sys:
+        description: "Publish libgit2-sys"
+        type: boolean
+        default: true
+
+permissions:
+  contents: write
+
+jobs:
+  publish:
+    name: Publish to crates.io
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+        with:
+          submodules: true
+      - name: Publish
+        env:
+          CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+          PUBLISH_GIT2: ${{ inputs.git2 }}
+          PUBLISH_GIT2_CURL: ${{ inputs.git2_curl }}
+          PUBLISH_LIBGIT2_SYS: ${{ inputs.libgit2_sys }}
+        run: ./ci/publish.sh

.gitignore

@@ -1,3 +1,2 @@
 target
-Cargo.lock
 src/main.rs