Merge remote-tracking branch 'upstream/main'

Lots of conflicts - gross hacks applied to resolve

Author: adetaylor

.github/workflows/bindgen.yml

@@ -7,6 +7,9 @@ on:
   pull_request:
     branches:
       - main
+  merge_group:
+    branches:
+      - main
 
 jobs:
   rustfmt-clippy:
@@ -42,17 +45,25 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Install msrv
-        uses: actions-rs/toolchain@v1
+      - name: Install msrv for lib
+        uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           # MSRV below is documented in Cargo.toml and README.md, please update those if you
           # change this.
-          toolchain: 1.60.0
-          override: true
+          toolchain: 1.70.0
+
+      - name: Test lib with msrv
+        run: cargo +1.70.0 test --package bindgen
+
+      - name: Install msrv for cli
+        uses: dtolnay/rust-toolchain@master
+        with:
+          # MSRV below is documented in Cargo.toml and README.md, please update those if you
+          # change this.
+          toolchain: 1.70.0
 
-      - name: Build with msrv
-        run: rm Cargo.lock && cargo +1.60.0 build --lib
+      - name: Test cli with msrv
+        run: cargo +1.70.0 build --package bindgen-cli
 
   minimal:
     runs-on: ubuntu-latest
@@ -85,8 +96,11 @@ jobs:
           toolchain: stable
           override: true
 
-      - name: Generate documentation 
-        run: cargo doc --document-private-items 
+      - name: Generate documentation for `bindgen` 
+        run: cargo doc --document-private-items --no-deps -p bindgen 
+
+      - name: Generate documentation for `bindgen-cli` 
+        run: cargo doc --document-private-items --no-deps -p bindgen-cli
 
   quickchecking:
     runs-on: ubuntu-latest
@@ -108,9 +122,7 @@ jobs:
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        # TODO(#1954): These should be run on mac too, but turns out they're
-        # broken.
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-12]
     steps:
       - uses: actions/checkout@v3
 
@@ -133,7 +145,7 @@ jobs:
           - debian: null
             cross: null
             rust: null
-        llvm_version: ["5.0", "9.0"]
+        llvm_version: ["9.0", "16.0"]
         main_tests: [1]
         release_build: [0, 1]
         no_default_features: [0, 1]
@@ -146,7 +158,7 @@ jobs:
           # Test with extra asserts + docs just with latest llvm versions to
           # prevent explosion
           - os: ubuntu-latest
-            llvm_version: "9.0"
+            llvm_version: "16.0"
             release_build: 0
             no_default_features: 0
             feature_extra_asserts: 1
@@ -160,13 +172,16 @@ jobs:
           #     debian: arm64
           #     cross: aarch64-linux-gnu
           #     rust: aarch64-unknown-linux-gnu
-          #   llvm_version: "9.0"
+          #   llvm_version: "16.0"
           #   main_tests: 0
           #   release_build: 0
           #   feature_extra_asserts: 0
 
           # Ensure stuff works on macos too
-          - os: macos-latest
+          # FIXME: Ideally should use the latest llvm version, but llvm doesn't
+          # provide releases for x86-64 macOS anymore which is what the runner uses.
+          #
+          - os: macos-12
             llvm_version: "9.0"
             release_build: 0
             no_default_features: 0
@@ -214,21 +229,46 @@ jobs:
           BINDGEN_NO_DEFAULT_FEATURES: ${{matrix.no_default_features}}
         run: ./ci/test.sh
 
-  test-book:
+  check-cfg:
     runs-on: ubuntu-latest
+    env:
+      RUSTFLAGS: -D warnings
     steps:
       - uses: actions/checkout@v3
-
-      - name: Install stable
+      
+      - name: Install nightly
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
+          toolchain: nightly
           override: true
+      
+      - name: Check cfg
+        run: cargo check -Z unstable-options -Z check-cfg
+
+  test-book:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
 
       # NOTE(emilio): Change deploy-book as well if you change this.
       - name: Test book
         run: |
           curl -L https://github.com/rust-lang/mdBook/releases/download/v0.4.5/mdbook-v0.4.5-x86_64-unknown-linux-gnu.tar.gz | tar xz
           ./mdbook build book
           ./mdbook test book
+
+  # One job that "summarizes" the success state of this pipeline. This can then
+  # be added to branch protection, rather than having to add each job
+  # separately.
+  success:
+    runs-on: ubuntu-latest
+    needs: [rustfmt-clippy, msrv, minimal, docs, quickchecking, test-expectations, test, check-cfg, test-book]
+    # GitHub branch protection is exceedingly silly and treats "jobs skipped
+    # because a dependency failed" as success. So we have to do some
+    # contortions to ensure the job fails if any of its dependencies fails.
+    if: always() # make sure this is never "skipped"
+    steps:
+      # Manually check the status of all dependencies. `if: failure()` does not work.
+      - name: check if any dependency failed
+        run: jq --exit-status 'all(.result == "success")' <<< '${{ toJson(needs) }}'

.github/workflows/deploy-book.yml

@@ -13,13 +13,6 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Install stable
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-
       - name: Test book
         run: |
           curl -L https://github.com/rust-lang/mdBook/releases/download/v0.4.5/mdbook-v0.4.5-x86_64-unknown-linux-gnu.tar.gz | tar xz

.github/workflows/publish.yml

@@ -0,0 +1,24 @@
+# This is triggered after the Release workflow successfully completes its run
+on:
+  workflow_run:
+    workflows:
+      - Release
+    types:
+      - completed
+env:
+  CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
+jobs:
+  cargo-publish:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v3
+      - name: Install stable toolchain
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+      - name: Publish bindgen (lib)
+        run: cargo publish --package bindgen --token ${CARGO_REGISTRY_TOKEN}
+      - name: Publish bindgen-cli
+        run: cargo publish --package bindgen-cli --token ${CARGO_REGISTRY_TOKEN}