From 6233f5b95a640608ccb5a9fb0eecf6a94df1931f Mon Sep 17 00:00:00 2001 From: Martynas Gurskas Date: Fri, 9 Feb 2024 15:58:27 +0200 Subject: [PATCH] Bump v0.25.0-4 Signed-off-by: Martynas Gurskas --- .github/workflows/tests.yml | 2 +- Dockerfile | 10 +++++----- README.md | 1 + compatibility-test/setup_test_source.sh | 16 ++++++++-------- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2656d27..5e9e138 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,7 +27,7 @@ jobs: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 - uses: actions-rs/toolchain@b2417cde72dcf67f306c0ae8e0828a81bf0b189f with: - toolchain: "1.72" + toolchain: "1.74" default: true - uses: actions-rs/cargo@ae10961054e4aa8b4aa7dffede299aaf087aa33b with: diff --git a/Dockerfile b/Dockerfile index fd48902..ddd0e0d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ -FROM rust:1.72-bullseye as builder +FROM rust:1.74-bullseye as builder COPY . /project # Download crates.io index, saves time if subsequent steps change RUN cargo search --limit 0 RUN cd /project && cargo install --path uniffi-bindgen -RUN cargo install uniffi-bindgen-cs --tag v0.7.0+v0.25.0 --git https://github.com/NordSecurity/uniffi-bindgen-cs -RUN cargo install uniffi-bindgen-go --tag v0.2.0+v0.25.0 --git https://github.com/NordSecurity/uniffi-bindgen-go -RUN cargo install uniffi-bindgen-cpp --tag v0.3.0+v0.25.0 --git https://github.com/NordSecurity/uniffi-bindgen-cpp +RUN cargo install uniffi-bindgen-cs --tag v0.8.0+v0.25.0 --git https://github.com/NordSecurity/uniffi-bindgen-cs +RUN cargo install uniffi-bindgen-go --tag v0.2.1+v0.25.0 --git https://github.com/NordSecurity/uniffi-bindgen-go +RUN cargo install uniffi-bindgen-cpp --tag v0.4.0+v0.25.0 --git https://github.com/NordSecurity/uniffi-bindgen-cpp -FROM rust:1.72-bullseye +FROM rust:1.74-bullseye COPY --from=builder /usr/local/cargo/bin/uniffi-bindgen /bin COPY --from=builder /usr/local/cargo/bin/uniffi-bindgen-cs /bin COPY --from=builder /usr/local/cargo/bin/uniffi-bindgen-go /bin diff --git a/README.md b/README.md index 0330c0d..b62c62c 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ shows which versions of each generator are inside the docker image. | Docker image | uniffi-rs version | uniffi-bindgen-cs version | uniffi-bindgen-go version | uniffi-bindgen-cpp version | |------------------------|-----------------------|---------------------------|---------------------------|----------------------------| +| v0.25.0-4 | v0.3.0+0.25.0 | **v0.8.0+v0.25.0** | **v0.2.1+v0.25.0** | **v0.4.0+v0.25.0** | | v0.25.0-3 | v0.3.0+0.25.0 | v0.7.0+v0.25.0 | v0.2.0+v0.25.0 | **v0.3.0+v0.25.0** | | v0.25.0-2 | v0.3.0+0.25.0 | v0.7.0+v0.25.0 | v0.2.0+v0.25.0 | **v0.2.2+v0.25.0** | | v0.25.0-1 | **v0.3.0+0.25.0** | **v0.7.0+v0.25.0** | **v0.2.0+v0.25.0** | **v0.1.0+v0.25.0** | diff --git a/compatibility-test/setup_test_source.sh b/compatibility-test/setup_test_source.sh index da5fc59..6ffbfec 100755 --- a/compatibility-test/setup_test_source.sh +++ b/compatibility-test/setup_test_source.sh @@ -33,20 +33,20 @@ download_file "$GITHUB_URL/fixtures/coverall/tests/bindings/test_coverall.kts" download_file "$GITHUB_URL/fixtures/coverall/tests/bindings/test_coverall.py" "$TMP_DIR/python" download_file "$GITHUB_URL/fixtures/coverall/tests/bindings/test_coverall.swift" "$TMP_DIR/swift" -GITHUB_VERSION="v0.7.0+v0.25.0" +GITHUB_VERSION="v0.8.0+v0.25.0" GITHUB_URL="https://raw.githubusercontent.com/NordSecurity/uniffi-bindgen-cs/$GITHUB_VERSION" -download_file "$GITHUB_URL/dotnet-tests/UniffiCS.binding_tests/TestCoverall.cs" "$TMP_DIR/cs/UniffiCS.binding_tests" -download_file "$GITHUB_URL/dotnet-tests/UniffiCS.binding_tests/UniffiCS.binding_tests.csproj" "$TMP_DIR/cs/UniffiCS.binding_tests" -download_file "$GITHUB_URL/dotnet-tests/UniffiCS.binding_tests/Usings.cs" "$TMP_DIR/cs/UniffiCS.binding_tests" +download_file "$GITHUB_URL/dotnet-tests/UniffiCS.BindingTests/TestCoverall.cs" "$TMP_DIR/cs/UniffiCS.binding_tests" +download_file "$GITHUB_URL/dotnet-tests/UniffiCS.BindingTests/UniffiCS.BindingTests.csproj" "$TMP_DIR/cs/UniffiCS.binding_tests" +download_file "$GITHUB_URL/dotnet-tests/UniffiCS.BindingTests/Usings.cs" "$TMP_DIR/cs/UniffiCS.binding_tests" download_file "$GITHUB_URL/dotnet-tests/UniffiCS/UniffiCS.csproj" "$TMP_DIR/cs/UniffiCS" -GITHUB_VERSION="v0.2.0+v0.25.0" +GITHUB_VERSION="v0.2.1+v0.25.0" GITHUB_URL="https://raw.githubusercontent.com/NordSecurity/uniffi-bindgen-go/$GITHUB_VERSION" download_file "$GITHUB_URL/binding_tests/coverall_test.go" "$TMP_DIR/go" download_file "$GITHUB_URL/binding_tests/go.mod" "$TMP_DIR/go" download_file "$GITHUB_URL/binding_tests/go.sum" "$TMP_DIR/go" -GITHUB_VERSION="v0.3.0+v0.25.0" +GITHUB_VERSION="v0.4.0+v0.25.0" GITHUB_URL="https://raw.githubusercontent.com/NordSecurity/uniffi-bindgen-cpp/$GITHUB_VERSION" -download_file "$GITHUB_URL/cpp-tests/tests/coverall/main.cpp" "$TMP_DIR/cpp/coverall" -download_file "$GITHUB_URL/cpp-tests/tests/include/test_common.hpp" "$TMP_DIR/cpp/include" +download_file "$GITHUB_URL/cpp-tests/tests/coverall/main.cpp" "$TMP_DIR/cpp/coverall" +download_file "$GITHUB_URL/cpp-tests/include/test_common.hpp" "$TMP_DIR/cpp/include"