diff --git a/.mergify.yml b/.mergify.yml index dab757ec..9504ac33 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,22 +1,17 @@ queue_rules: - name: default - merge_method: merge - conditions: - - check-success~=Build & Test - Nixpkgs - .* - - check-success~=Build & Test - Examples \(.*\) - -pull_request_rules: - - name: merge using the merge queue - conditions: + queue_conditions: - base=master - check-success~=Build & Test - Nixpkgs - .* - check-success~=Build & Test - Examples \(.*\) - "#approved-reviews-by>=1" - "label=merge-queue" - actions: - queue: - name: default - method: merge + merge_conditions: + - check-success~=Build & Test - Nixpkgs - .* + - check-success~=Build & Test - Examples \(.*\) + merge_method: merge + +pull_request_rules: - name: remove from merge-queue after merge conditions: - merged @@ -24,3 +19,7 @@ pull_request_rules: label: remove: - "merge-queue" + - name: merge using the merge queue + conditions: [] + actions: + queue: diff --git a/examples/toolchains/cc_cross_osx_to_linux_amd64/WORKSPACE b/examples/toolchains/cc_cross_osx_to_linux_amd64/WORKSPACE index 1639a8d9..cfb8c219 100644 --- a/examples/toolchains/cc_cross_osx_to_linux_amd64/WORKSPACE +++ b/examples/toolchains/cc_cross_osx_to_linux_amd64/WORKSPACE @@ -147,7 +147,7 @@ load("@rules_oci//oci:pull.bzl", "oci_pull") oci_pull( name = "distroless_base", - digest = "sha256:c925d12234f8d3fbef2256012b168004d4c47a82c4f06afcfd06fd208732fbe0", + digest = "sha256:e9d0321de8927f69ce20e39bfc061343cce395996dfc1f0db6540e5145bc63a5", image = "gcr.io/distroless/base", platforms = [ "linux/amd64", diff --git a/examples/toolchains/rust/WORKSPACE b/examples/toolchains/rust/WORKSPACE index f83783cc..27a64967 100644 --- a/examples/toolchains/rust/WORKSPACE +++ b/examples/toolchains/rust/WORKSPACE @@ -9,9 +9,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # https://bazelbuild.github.io/rules_rust/#setup http_archive( name = "rules_rust", - sha256 = "85e2013727ab26fb22abdffe4b2ac0c27a2d5b6296167ba63d8f6e13140f51f9", + sha256 = "af4f56caae50a99a68bfce39b141b509dd68548c8204b98ab7a1cafc94d5bb02", urls = [ - "https://github.com/bazelbuild/rules_rust/releases/download/0.53.0/rules_rust-v0.53.0.tar.gz", + "https://github.com/bazelbuild/rules_rust/releases/download/0.54.1/rules_rust-v0.54.1.tar.gz", ], ) @@ -62,15 +62,14 @@ nixpkgs_package( ], ) -load("@rules_rust//rust:repositories.bzl", "rust_repositories") +load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies") -rust_repositories() +rules_rust_dependencies() # crate_universe as a way of governing deps load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencies") crate_universe_dependencies( - bootstrap = True, rust_toolchain_cargo_template = "@nix_rust//:bin/{tool}", rust_toolchain_rustc_template = "@nix_rust//:bin/{tool}", ) @@ -94,6 +93,10 @@ OPENSSL_CRATE_ANNOTATION = crate.annotation( ], ) +# buildifier: disable=bzl-visibility +load("@rules_rust//crate_universe/private:urls.bzl", "CARGO_BAZEL_URLS", "CARGO_BAZEL_SHA256S") +load("@rules_rust//rust/platform:triple_mappings.bzl", "SUPPORTED_PLATFORM_TRIPLES") + crates_repository( name = "crate_index", # Ensure the caro openssl-sys crate @@ -111,12 +114,20 @@ crates_repository( features = [], ), }, - generator = "@cargo_bazel_bootstrap//:cargo-bazel", + # rules_rust provides static binaries for linux, but does not use them by default + generator_urls = CARGO_BAZEL_URLS | { + "x86_64-unknown-linux-gnu": CARGO_BAZEL_URLS["x86_64-unknown-linux-musl"], + }, + generator_sha256s = CARGO_BAZEL_SHA256S | { + "x86_64-unknown-linux-gnu": CARGO_BAZEL_SHA256S["x86_64-unknown-linux-musl"], + }, render_config = render_config( default_package_name = "", ), rust_toolchain_cargo_template = "@nix_rust//:bin/{tool}", rust_toolchain_rustc_template = "@nix_rust//:bin/{tool}", + # the `wasm32-wasip1` target is not supported by nix_rustc (or named differently) + supported_platform_triples = [ triple for triple in SUPPORTED_PLATFORM_TRIPLES if triple != "wasm32-wasip1"], ) load("@crate_index//:defs.bzl", "crate_repositories") diff --git a/examples/toolchains/rust/cargo-bazel-lock.json b/examples/toolchains/rust/cargo-bazel-lock.json index f901e16c..7101a44d 100644 --- a/examples/toolchains/rust/cargo-bazel-lock.json +++ b/examples/toolchains/rust/cargo-bazel-lock.json @@ -1,5 +1,5 @@ { - "checksum": "37bb718b562c2aa348987c089bf229259fefd493217783470d5cbab635f5d96c", + "checksum": "7f7d82ec2821b07887547659086f5c71632af4fda0f7f74885ff887df2547043", "crates": { "autocfg 1.1.0": { "name": "autocfg", @@ -1093,15 +1093,15 @@ "aarch64-apple-ios-sim": [ "aarch64-apple-ios-sim" ], - "aarch64-fuchsia": [ - "aarch64-fuchsia" - ], "aarch64-linux-android": [ "aarch64-linux-android" ], "aarch64-pc-windows-msvc": [ "aarch64-pc-windows-msvc" ], + "aarch64-unknown-fuchsia": [ + "aarch64-unknown-fuchsia" + ], "aarch64-unknown-linux-gnu": [ "aarch64-unknown-linux-gnu" ], @@ -1170,9 +1170,6 @@ "x86_64-apple-ios": [ "x86_64-apple-ios" ], - "x86_64-fuchsia": [ - "x86_64-fuchsia" - ], "x86_64-linux-android": [ "x86_64-linux-android" ], @@ -1182,6 +1179,9 @@ "x86_64-unknown-freebsd": [ "x86_64-unknown-freebsd" ], + "x86_64-unknown-fuchsia": [ + "x86_64-unknown-fuchsia" + ], "x86_64-unknown-linux-gnu": [ "x86_64-unknown-linux-gnu" ], diff --git a/testing/python/poetry.lock b/testing/python/poetry.lock index 5d3a3163..781ad18f 100644 --- a/testing/python/poetry.lock +++ b/testing/python/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. [[package]] name = "blinker" diff --git a/testing/rust/MODULE.bazel b/testing/rust/MODULE.bazel index 8deac088..4a40978a 100644 --- a/testing/rust/MODULE.bazel +++ b/testing/rust/MODULE.bazel @@ -26,7 +26,7 @@ local_path_override( bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "rules_cc", version = "0.0.9") -bazel_dep(name = "rules_rust", version = "0.53.0") +bazel_dep(name = "rules_rust", version = "0.54.1") # TODO[AH] Remove these transitive dependencies once nixpkgs_java_configure has # become a module extension in rules_nixpkgs_java. diff --git a/testing/rust/WORKSPACE b/testing/rust/WORKSPACE index 9674d852..21b95e52 100644 --- a/testing/rust/WORKSPACE +++ b/testing/rust/WORKSPACE @@ -37,9 +37,9 @@ bazel_skylib_workspace() http_archive( name = "rules_rust", - sha256 = "85e2013727ab26fb22abdffe4b2ac0c27a2d5b6296167ba63d8f6e13140f51f9", + sha256 = "af4f56caae50a99a68bfce39b141b509dd68548c8204b98ab7a1cafc94d5bb02", urls = [ - "https://github.com/bazelbuild/rules_rust/releases/download/0.53.0/rules_rust-v0.53.0.tar.gz" + "https://github.com/bazelbuild/rules_rust/releases/download/0.54.1/rules_rust-v0.54.1.tar.gz" ], )