From b606631775a4e386dd31943ca5ea51815d02295c Mon Sep 17 00:00:00 2001 From: Christian Poveda Date: Tue, 6 Dec 2022 15:00:42 -0500 Subject: [PATCH 1/5] Bump `clang-sys` version --- CHANGELOG.md | 1 + Cargo.lock | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff6d35ff69..3b7b53860f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -158,6 +158,7 @@ name. * The `ParseCallbacks::generated_name_override` now receives `ItemInfo<'_>` as argument instead of a `&str`. + * Updated the `clang-sys` crate version to 1.4.0 to support clang 15. ## Removed diff --git a/Cargo.lock b/Cargo.lock index ff13ebcb5e..ec6ba174fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -131,9 +131,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clang-sys" -version = "1.3.3" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a050e2153c5be08febd6734e29298e844fdb0fa21aeddd63b4eb7baa106c69b" +checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" dependencies = [ "glob", "libc", From 47d674c820bf60410308cfc87827503a9f6b81fe Mon Sep 17 00:00:00 2001 From: Christian Poveda Date: Tue, 6 Dec 2022 20:14:34 -0500 Subject: [PATCH 2/5] add libtinfo5 package --- .github/workflows/bindgen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bindgen.yml b/.github/workflows/bindgen.yml index bc8477d503..6848c141f4 100644 --- a/.github/workflows/bindgen.yml +++ b/.github/workflows/bindgen.yml @@ -157,7 +157,7 @@ jobs: 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}} + sudo apt-get install libc6:${{matrix.target.debian}} libstdc++6:${{matrix.target.debian}} libtinfo5:${{matrix.target.debian}} - name: Install stable uses: actions-rs/toolchain@v1 From 25c3b0b2f3c71f820ce5f48352a10b83f7ba7979 Mon Sep 17 00:00:00 2001 From: Christian Poveda Date: Tue, 6 Dec 2022 20:21:22 -0500 Subject: [PATCH 3/5] fixup --- .github/workflows/bindgen.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bindgen.yml b/.github/workflows/bindgen.yml index 6848c141f4..924190f5e4 100644 --- a/.github/workflows/bindgen.yml +++ b/.github/workflows/bindgen.yml @@ -157,7 +157,7 @@ jobs: 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}} libtinfo5:${{matrix.target.debian}} + sudo apt-get install libc6:${{matrix.target.debian}} libstdc++6:${{matrix.target.debian}} - name: Install stable uses: actions-rs/toolchain@v1 @@ -166,7 +166,10 @@ jobs: toolchain: stable target: ${{matrix.target.rust}} override: true - + - name: Install libtinfo + run: | + sudo apt-get update + sudo apt-get install libtinfo5 - name: Run all the tests env: GITHUB_ACTIONS_OS: ${{matrix.os}} From d25542da2590172ad793a723721f7c3471649c6d Mon Sep 17 00:00:00 2001 From: Christian Poveda Date: Tue, 6 Dec 2022 20:24:52 -0500 Subject: [PATCH 4/5] fixup --- .github/workflows/bindgen.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/bindgen.yml b/.github/workflows/bindgen.yml index 924190f5e4..7cb2201d2a 100644 --- a/.github/workflows/bindgen.yml +++ b/.github/workflows/bindgen.yml @@ -167,6 +167,7 @@ jobs: target: ${{matrix.target.rust}} override: true - name: Install libtinfo + if: matrix.os.ubuntu-latest run: | sudo apt-get update sudo apt-get install libtinfo5 From 069aad63484fe60e7fef0eb7860c5bbfcbbd7622 Mon Sep 17 00:00:00 2001 From: Christian Poveda Date: Tue, 6 Dec 2022 20:56:40 -0500 Subject: [PATCH 5/5] fixme --- .github/workflows/bindgen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bindgen.yml b/.github/workflows/bindgen.yml index 7cb2201d2a..85f5d437a4 100644 --- a/.github/workflows/bindgen.yml +++ b/.github/workflows/bindgen.yml @@ -167,7 +167,7 @@ jobs: target: ${{matrix.target.rust}} override: true - name: Install libtinfo - if: matrix.os.ubuntu-latest + if: matrix.os == 'ubuntu-latest' run: | sudo apt-get update sudo apt-get install libtinfo5