Merge remote-tracking branch 'upstream/main' into merge-latest-upstream

Author: adetaylor

.github/workflows/bindgen.yml

@@ -37,25 +37,25 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Read crate metadata
+        id: metadata
+        run: echo "rust-version=$(sed -ne 's/rust-version *= *\"\(.*\)\"/\1/p' Cargo.toml)" >> $GITHUB_OUTPUT
+
       - name: Install msrv for lib
         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
+          toolchain: ${{ steps.metadata.outputs.rust-version }}
 
       - name: Test lib with msrv
-        run: cargo +1.70.0 test --package bindgen
+        run: cargo +${{ steps.metadata.outputs.rust-version }} 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
+          toolchain: ${{ steps.metadata.outputs.rust-version }}
 
       - name: Test cli with msrv
-        run: cargo +1.70.0 build --package bindgen-cli
+        run: cargo +${{ steps.metadata.outputs.rust-version }} build --package bindgen-cli
 
   minimal:
     runs-on: ubuntu-latest
@@ -108,7 +108,7 @@ jobs:
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-12]
+        os: [ubuntu-latest, macos-latest]
     steps:
       - uses: actions/checkout@v4
 
@@ -125,12 +125,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        target:
-          - debian: null
-            cross: null
-            rust: null
         llvm_version: ["9.0", "16.0"]
-        main_tests: [1]
         release_build: [0, 1]
         no_default_features: [0, 1]
         # FIXME: There are no pre-built static libclang libraries, so the
@@ -147,64 +142,31 @@ jobs:
             no_default_features: 0
             feature_extra_asserts: 1
 
-          # FIXME: Seems installing multiarch packages fails:
-          #
-          #   https://github.com/rust-lang/rust-bindgen/pull/2037/checks?check_run_id=2441799333
-          #
-          # - os: ubuntu-latest
-          #   target:
-          #     debian: arm64
-          #     cross: aarch64-linux-gnu
-          #     rust: aarch64-unknown-linux-gnu
-          #   llvm_version: "16.0"
-          #   main_tests: 0
-          #   release_build: 0
-          #   feature_extra_asserts: 0
-
           # Ensure stuff works on macos too
-          # 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"
+          - os: macos-latest
+            llvm_version: "16.0"
             release_build: 0
             no_default_features: 0
             feature_extra_asserts: 0
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install multiarch packages
-        if: matrix.target.debian
-        run: |
-          sudo apt-get install binfmt-support qemu-user-static gcc-${{matrix.target.cross}} g++-${{matrix.target.cross}}
-          source /etc/lsb-release
-          sudo tee /etc/apt/sources.list <<EOF >/dev/null
-          deb [arch=${{matrix.target.debian}}] http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME main
-          deb [arch=${{matrix.target.debian}}] http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-updates main
-          deb [arch=${{matrix.target.debian}}] http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-backports main
-          deb [arch=${{matrix.target.debian}}] http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-security main
-          EOF
-          sudo dpkg --add-architecture ${{matrix.target.debian}}
-          sudo apt-get update
-          sudo apt-get install libc6:${{matrix.target.debian}} libstdc++6:${{matrix.target.debian}}
-
       - name: Install stable
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
-          target: ${{matrix.target.rust}}
       - name: Install libtinfo
         if: matrix.os == 'ubuntu-latest'
         run: |
-          sudo apt-get update
-          sudo apt-get install libtinfo5
+          wget https://mirrors.kernel.org/ubuntu/pool/universe/n/ncurses/libtinfo5_6.3-2ubuntu0.1_amd64.deb
+          sudo dpkg -i libtinfo5_6.3-2ubuntu0.1_amd64.deb
+      - name: Install LLVM and Clang
+        uses: KyleMayes/install-llvm-action@v2.0.5
+        with:
+          version: ${{matrix.llvm_version}}
       - name: Run all the tests
         env:
           GITHUB_ACTIONS_OS: ${{matrix.os}}
-          RUST_CROSS_COMPILER: ${{matrix.target.cross}}
-          RUST_TARGET: ${{matrix.target.rust}}
-          LLVM_VERSION: ${{matrix.llvm_version}}
-          BINDGEN_MAIN_TESTS: ${{matrix.main_tests}}
           BINDGEN_RELEASE_BUILD: ${{matrix.release_build}}
           BINDGEN_FEATURE_RUNTIME: ${{matrix.feature_runtime}}
           BINDGEN_FEATURE_EXTRA_ASSERTS: ${{matrix.feature_extra_asserts}}
@@ -239,12 +201,27 @@ jobs:
           ./mdbook build book
           ./mdbook test book
 
+  # FIXME(pvdrz): this should be done inside `bindgen-test` instead
+  test-no-headers:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Test `--help`
+        run: cargo run -- --help
+
+      - name: Test `--version`
+        run: cargo run -- --version
+
+      - name: Test `--generate-shell-completions`
+        run: cargo run -- --generate-shell-completions=bash
+
   # 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]
+    needs: [rustfmt-clippy, msrv, minimal, docs, quickchecking, test-expectations, test, check-cfg, test-book, test-no-headers]
     # 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.

.github/workflows/create-tag.yml

@@ -4,14 +4,35 @@ on:
   pull_request:
     types:
       - closed
-
+  workflow_dispatch:
+    inputs:
+      commit:
+        description: 'Commit hash'
+        required: true
+        type: string
 jobs:
   create-tag:
-    if: github.event.pull_request.merged == true && github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name && startsWith(github.event.pull_request.head.ref, 'bump-version')
+    if: >-
+      (inputs.commit || false) ||
+      (github.event.pull_request.merged == true &&
+       github.event.pull_request.user.login == 'github-actions' &&
+       github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name &&
+       startsWith(github.event.pull_request.head.ref, 'bump-version') )
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      
+      - name: Compute the commit
+        run: |
+          if [[ -z "${{ inputs.commit }}" ]]; then
+            COMMIT=$(git rev-parse ${{ github.sha }}^@ | grep -Fvx ${{ github.event.pull_request.head.sha }})
+          else
+            COMMIT="${{ inputs.commit }}"
+          fi
+          echo "commit=$COMMIT" >> $GITHUB_ENV
 
       - name: Install rust toolchain
         uses: dtolnay/rust-toolchain@stable
@@ -21,7 +42,8 @@ jobs:
           echo "version=$(cargo pkgid -p bindgen | cut -d '#' -f 2)" >> $GITHUB_ENV
  
       - name: Create tag
-        run: |
-          TAG_NAME="v${{ env.version }}"
-          git tag $TAG_NAME
-          git push origin $TAG_NAME
+        uses: mathieudutour/github-tag-action@v6.2
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          commit_sha: ${{ env.commit }} 
+          custom_tag: ${{ env.version }}

.github/workflows/deploy-book.yml

@@ -15,7 +15,7 @@ jobs:
 
       - 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
+          curl -L https://github.com/rust-lang/mdBook/releases/download/v0.4.34/mdbook-v0.4.34-x86_64-unknown-linux-gnu.tar.gz | tar xz
           ./mdbook build book
           ./mdbook test book
 

.github/workflows/release.yml

@@ -1,3 +1,5 @@
+# This file was autogenerated by cargo-dist: https://opensource.axo.dev/cargo-dist/
+#
 # Copyright 2022-2024, axodotdev
 # SPDX-License-Identifier: MIT or Apache-2.0
 #
@@ -61,7 +63,7 @@ jobs:
         # we specify bash to get pipefail; it guards against the `curl` command
         # failing. otherwise `sh` won't catch that `curl` returned non-0
         shell: bash
-        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.21.0/cargo-dist-installer.sh | sh"
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.22.1/cargo-dist-installer.sh | sh"
       - name: Cache cargo-dist
         uses: actions/upload-artifact@v4
         with: