Skip to content

Commit cfab753

Browse files
authored
Merge branch 'main' into extended-callbacks
2 parents bf34530 + d9576ea commit cfab753

File tree

219 files changed

+10583
-11890
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

219 files changed

+10583
-11890
lines changed

.github/workflows/bindgen.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,25 @@ jobs:
3737
steps:
3838
- uses: actions/checkout@v4
3939

40+
- name: Read crate metadata
41+
id: metadata
42+
run: echo "rust-version=$(sed -ne 's/rust-version *= *\"\(.*\)\"/\1/p' Cargo.toml)" >> $GITHUB_OUTPUT
43+
4044
- name: Install msrv for lib
4145
uses: dtolnay/rust-toolchain@master
4246
with:
43-
# MSRV below is documented in Cargo.toml and README.md, please update those if you
44-
# change this.
45-
toolchain: 1.70.0
47+
toolchain: ${{ steps.metadata.outputs.rust-version }}
4648

4749
- name: Test lib with msrv
48-
run: cargo +1.70.0 test --package bindgen
50+
run: cargo +${{ steps.metadata.outputs.rust-version }} test --package bindgen
4951

5052
- name: Install msrv for cli
5153
uses: dtolnay/rust-toolchain@master
5254
with:
53-
# MSRV below is documented in Cargo.toml and README.md, please update those if you
54-
# change this.
55-
toolchain: 1.70.0
55+
toolchain: ${{ steps.metadata.outputs.rust-version }}
5656

5757
- name: Test cli with msrv
58-
run: cargo +1.70.0 build --package bindgen-cli
58+
run: cargo +${{ steps.metadata.outputs.rust-version }} build --package bindgen-cli
5959

6060
minimal:
6161
runs-on: ubuntu-latest
@@ -196,8 +196,8 @@ jobs:
196196
- name: Install libtinfo
197197
if: matrix.os == 'ubuntu-latest'
198198
run: |
199-
sudo apt-get update
200-
sudo apt-get install libtinfo5
199+
wget https://mirrors.kernel.org/ubuntu/pool/universe/n/ncurses/libtinfo5_6.3-2ubuntu0.1_amd64.deb
200+
sudo dpkg -i libtinfo5_6.3-2ubuntu0.1_amd64.deb
201201
- name: Run all the tests
202202
env:
203203
GITHUB_ACTIONS_OS: ${{matrix.os}}
@@ -209,6 +209,7 @@ jobs:
209209
BINDGEN_FEATURE_RUNTIME: ${{matrix.feature_runtime}}
210210
BINDGEN_FEATURE_EXTRA_ASSERTS: ${{matrix.feature_extra_asserts}}
211211
BINDGEN_NO_DEFAULT_FEATURES: ${{matrix.no_default_features}}
212+
BINDGEN_RUST_FOR_LINUX_TEST: ${{matrix.os == 'ubuntu-latest' && matrix.llvm_version == '16.0' && matrix.feature_extra_asserts == 0 && 1 || 0}}
212213
run: ./ci/test.sh
213214

214215
check-cfg:

.github/workflows/release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# This file was autogenerated by cargo-dist: https://opensource.axo.dev/cargo-dist/
2+
#
13
# Copyright 2022-2024, axodotdev
24
# SPDX-License-Identifier: MIT or Apache-2.0
35
#
@@ -37,7 +39,6 @@ permissions:
3739
# If there's a prerelease-style suffix to the version, then the release(s)
3840
# will be marked as a prerelease.
3941
on:
40-
pull_request:
4142
push:
4243
tags:
4344
- '**[0-9]+.[0-9]+.[0-9]+*'
@@ -61,7 +62,7 @@ jobs:
6162
# we specify bash to get pipefail; it guards against the `curl` command
6263
# failing. otherwise `sh` won't catch that `curl` returned non-0
6364
shell: bash
64-
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.21.0/cargo-dist-installer.sh | sh"
65+
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.22.1/cargo-dist-installer.sh | sh"
6566
- name: Cache cargo-dist
6667
uses: actions/upload-artifact@v4
6768
with:

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@
215215
--------------------------------------------------------------------------------
216216
# Unreleased
217217
## Added
218+
- Add support for custom attributes (--with-attribute-custom, #2866)
218219
## Changed
219220
- The `--wrap-static-fns` related options no longer require the experimental feature or flag.
220221
## Removed
@@ -237,7 +238,6 @@
237238
- Add option to use DST structs for flexible arrays (--flexarray-dst, #2772).
238239
- Add option to dynamically load variables (#2812).
239240
- Add option in CLI to use rustified non-exhaustive enums (--rustified-non-exhaustive-enum, #2847).
240-
- Add support for custom attributes (--with-attribute-custom, #2866)
241241
## Changed
242242
- Remove which and lazy-static dependencies (#2809, #2817).
243243
- Generate compile-time layout tests (#2787).

0 commit comments

Comments
 (0)