From d0bf76ac8fb4a375a0f3636b6c66b38f0d702c21 Mon Sep 17 00:00:00 2001 From: Masaki Hara Date: Wed, 13 Sep 2023 09:12:00 +0900 Subject: [PATCH 1/2] Check in lockfile --- .github/workflows/test.yml | 5 ++++- .gitignore | 2 -- Cargo.lock | 44 ++++++++++++++++++++++++++++++++++++++ Cargo.lock.msrv | 42 ++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 Cargo.lock create mode 100644 Cargo.lock.msrv diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 285c3fb..464b7f6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ jobs: webp: 1.2.0 webp_from: bundled common_features: "" - - rust: 1.34.0 + - rust: 1.31.0 webp: 1.2.0 webp_from: build common_features: "" @@ -64,6 +64,9 @@ jobs: - name: Set __LIBWEBP_SYS_FORBID_BUILD run: echo __LIBWEBP_SYS_FORBID_BUILD=1 >> $GITHUB_ENV if: ${{ matrix.webp_from != 'bundled' }} + - name: Set up lockfile + run: cp Cargo.lock.msrv Cargo.lock + if: matrix.rust == '1.31.0' - name: Test 0.4 run: | cargo test --all --features "${{ matrix.common_features }}" diff --git a/.gitignore b/.gitignore index a821aa9..53eaa21 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ - /target **/*.rs.bk -Cargo.lock diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 index 0000000..04cc59b --- /dev/null +++ b/Cargo.lock @@ -0,0 +1,44 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "cc" +version = "1.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "libc" +version = "0.2.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" + +[[package]] +name = "libwebp-sys2" +version = "0.1.8" +dependencies = [ + "cc", + "cfg-if", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "pkg-config" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" diff --git a/Cargo.lock.msrv b/Cargo.lock.msrv new file mode 100644 index 0000000..c3ce1d9 --- /dev/null +++ b/Cargo.lock.msrv @@ -0,0 +1,42 @@ +[[package]] +name = "cc" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "libwebp-sys2" +version = "0.1.8" +dependencies = [ + "cc 1.0.61 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.147 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)", + "vcpkg 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[metadata] +"checksum cc 1.0.61 (registry+https://github.com/rust-lang/crates.io-index)" = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d" +"checksum cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +"checksum libc 0.2.147 (registry+https://github.com/rust-lang/crates.io-index)" = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +"checksum pkg-config 0.3.27 (registry+https://github.com/rust-lang/crates.io-index)" = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +"checksum vcpkg 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" From cfbe9b01a4dbbd79b4ed9fda23d81bf6a60158eb Mon Sep 17 00:00:00 2001 From: Masaki Hara Date: Thu, 14 Sep 2023 21:45:55 +0900 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80fc6a7..e36843b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## Unreleased + +- Misc + - Check in lockfile https://github.com/qnighy/libwebp-sys2-rs/pull/22 + ## 0.1.8 - Fixed