diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index cf3c375e5d..49ae6751b2 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -60,7 +60,7 @@ jobs: - os: ubuntu-22.04 env: TARGET: "s390x-unknown-linux-gnu" - - os: macOS-13 + - os: macos-15-intel env: TARGET: "x86_64-apple-darwin" - os: ubuntu-22.04 @@ -89,13 +89,17 @@ jobs: TARGET: "${{ matrix.env.TARGET }}" - name: Setup macos build tooling run: | - sudo xcode-select -s /Applications/Xcode_15.2.0.app/Contents/Developer/ + ls -la /Applications/ + sudo xcode-select -s /Applications/Xcode_16.1.app/Contents/Developer/ + xcodebuild -showsdks # Set SDK environment variables - echo "SDKROOT=$(xcrun -sdk macosx14.2 --show-sdk-path)" >> $GITHUB_ENV - MACOSX_DEPLOYMENT_TARGET="$(xcrun -sdk macosx14.2 --show-sdk-platform-version)" + echo "SDKROOT=$(xcrun -sdk ${{ env.TARGET_SDK }} --show-sdk-path)" >> $GITHUB_ENV + MACOSX_DEPLOYMENT_TARGET="$(xcrun -sdk ${{ env.TARGET_SDK }} --show-sdk-platform-version)" if [[ -n "${MACOSX_DEPLOYMENT_TARGET}" ]]; then echo "MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET}" >> $GITHUB_ENV fi + env: + TARGET_SDK: macosx15.1 if: startswith(matrix.os, 'macos') - name: Setup Windows Bazelrc run: | diff --git a/MODULE.bazel b/MODULE.bazel index fbbd333ea6..3dae74cc76 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -2,7 +2,7 @@ module( name = "rules_rust", - version = "0.68.0", + version = "0.68.1", ) ############################################################################### diff --git a/crate_universe/extensions.bzl b/crate_universe/extensions.bzl index 22c9d5554f..3d4e646da0 100644 --- a/crate_universe/extensions.bzl +++ b/crate_universe/extensions.bzl @@ -26,7 +26,7 @@ There are some examples of using crate_universe with bzlmod in the [example fold To use rules_rust in a project using bzlmod, add the following to your MODULE.bazel file: ```python -bazel_dep(name = "rules_rust", version = "0.68.0") +bazel_dep(name = "rules_rust", version = "0.68.1") ``` You find the latest version on the [release page](https://github.com/bazelbuild/rules_rust/releases). @@ -243,7 +243,7 @@ module( bazel_dep(name = "bazel_skylib", version = "1.8.2") # https://github.com/bazelbuild/rules_rust/releases -bazel_dep(name = "rules_rust", version = "0.68.0") +bazel_dep(name = "rules_rust", version = "0.68.1") ############################################################################### # T O O L C H A I N S diff --git a/docs/src/index.md b/docs/src/index.md index 25685b8c31..53f17057f3 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -20,7 +20,7 @@ Note that rules_rust bzlmod support is still a work in progress. Most features s To use `rules_rust` in a project using bzlmod, add the following to your `MODULE.bazel` file: ```python -bazel_dep(name = "rules_rust", version = "0.68.0") +bazel_dep(name = "rules_rust", version = "0.68.1") ``` Don't forget to substitute in your desired release's version number. diff --git a/examples/all_deps_vendor/README.md b/examples/all_deps_vendor/README.md index cf8ca8954d..3633a508df 100644 --- a/examples/all_deps_vendor/README.md +++ b/examples/all_deps_vendor/README.md @@ -26,7 +26,7 @@ module( bazel_dep(name = "bazel_skylib", version = "1.8.2") # https://github.com/bazelbuild/rules_rust/releases -bazel_dep(name = "rules_rust", version = "0.68.0") +bazel_dep(name = "rules_rust", version = "0.68.1") ############################################################################### # T O O L C H A I N S diff --git a/examples/cross_compile_llvm/README.md b/examples/cross_compile_llvm/README.md index 20bafdaf6a..fe403fdd13 100644 --- a/examples/cross_compile_llvm/README.md +++ b/examples/cross_compile_llvm/README.md @@ -43,7 +43,7 @@ You add the required rules for cross compilation to your MODULE.bazel as shown b ```Starlark # Get latest release from: # https://github.com/bazelbuild/rules_rust/releases -bazel_dep(name = "rules_rust", version = "0.68.0") +bazel_dep(name = "rules_rust", version = "0.68.1") # https://github.com/bazelbuild/platforms/releases bazel_dep(name = "platforms", version = "1.0.0") diff --git a/examples/ffi/README.md b/examples/ffi/README.md index 23ca75675f..a9b6314c60 100644 --- a/examples/ffi/README.md +++ b/examples/ffi/README.md @@ -21,7 +21,7 @@ module( # B A Z E L C E N T R A L R E G I S T R Y # https://registry.bazel.build/ ############################################################################### # https://github.com/bazelbuild/rules_rust/releases -bazel_dep(name = "rules_rust", version = "0.68.0") +bazel_dep(name = "rules_rust", version = "0.68.1") ############################################################################### # T O O L C H A I N S diff --git a/extensions/bindgen/MODULE.bazel b/extensions/bindgen/MODULE.bazel index 2cfceca13f..150072e854 100644 --- a/extensions/bindgen/MODULE.bazel +++ b/extensions/bindgen/MODULE.bazel @@ -2,10 +2,10 @@ module( name = "rules_rust_bindgen", - version = "0.68.0", + version = "0.68.1", ) -bazel_dep(name = "rules_rust", version = "0.68.0") +bazel_dep(name = "rules_rust", version = "0.68.1") bazel_dep(name = "bazel_features", version = "1.32.0") bazel_dep(name = "bazel_skylib", version = "1.8.2") bazel_dep(name = "platforms", version = "1.0.0") diff --git a/extensions/mdbook/MODULE.bazel b/extensions/mdbook/MODULE.bazel index 08499aed67..d976de7a33 100644 --- a/extensions/mdbook/MODULE.bazel +++ b/extensions/mdbook/MODULE.bazel @@ -2,10 +2,10 @@ module( name = "rules_rust_mdbook", - version = "0.68.0", + version = "0.68.1", ) -bazel_dep(name = "rules_rust", version = "0.68.0") +bazel_dep(name = "rules_rust", version = "0.68.1") bazel_dep(name = "rules_cc", version = "0.2.4") bazel_dep(name = "bazel_features", version = "1.32.0") bazel_dep(name = "bazel_skylib", version = "1.8.2") diff --git a/extensions/prost/MODULE.bazel b/extensions/prost/MODULE.bazel index 5a3accaf67..0cae808f16 100644 --- a/extensions/prost/MODULE.bazel +++ b/extensions/prost/MODULE.bazel @@ -2,10 +2,10 @@ module( name = "rules_rust_prost", - version = "0.68.0", + version = "0.68.1", ) -bazel_dep(name = "rules_rust", version = "0.68.0") +bazel_dep(name = "rules_rust", version = "0.68.1") bazel_dep(name = "platforms", version = "1.0.0") bazel_dep(name = "bazel_features", version = "1.32.0") bazel_dep(name = "bazel_skylib", version = "1.8.2") diff --git a/extensions/protobuf/MODULE.bazel b/extensions/protobuf/MODULE.bazel index 4b0ae87dda..5ae16f5a4e 100644 --- a/extensions/protobuf/MODULE.bazel +++ b/extensions/protobuf/MODULE.bazel @@ -2,10 +2,10 @@ module( name = "rules_rust_protobuf", - version = "0.68.0", + version = "0.68.1", ) -bazel_dep(name = "rules_rust", version = "0.68.0") +bazel_dep(name = "rules_rust", version = "0.68.1") bazel_dep(name = "bazel_features", version = "1.32.0") bazel_dep(name = "bazel_skylib", version = "1.8.2") bazel_dep(name = "platforms", version = "1.0.0") diff --git a/extensions/pyo3/BUILD.bazel b/extensions/pyo3/BUILD.bazel index 47e0506eed..bd4bcedcde 100644 --- a/extensions/pyo3/BUILD.bazel +++ b/extensions/pyo3/BUILD.bazel @@ -7,7 +7,6 @@ exports_files([ ".pylintrc.toml", "defs.bzl", "MODULE.bazel", - "version.bzl", ]) toolchain_type( diff --git a/extensions/pyo3/MODULE.bazel b/extensions/pyo3/MODULE.bazel index 60bce6f937..d948c352d1 100644 --- a/extensions/pyo3/MODULE.bazel +++ b/extensions/pyo3/MODULE.bazel @@ -2,10 +2,10 @@ module( name = "rules_rust_pyo3", - version = "0.68.0", + version = "0.68.1", ) -bazel_dep(name = "rules_rust", version = "0.68.0") +bazel_dep(name = "rules_rust", version = "0.68.1") bazel_dep(name = "rules_python", version = "1.6.3") bazel_dep(name = "bazel_skylib", version = "1.8.2") bazel_dep(name = "platforms", version = "1.0.0") diff --git a/extensions/pyo3/test/bzl_version/BUILD.bazel b/extensions/pyo3/test/bzl_version/BUILD.bazel deleted file mode 100644 index c791aa115f..0000000000 --- a/extensions/pyo3/test/bzl_version/BUILD.bazel +++ /dev/null @@ -1,18 +0,0 @@ -load("@rules_rust//rust:defs.bzl", "rust_test") -load("//:version.bzl", "VERSION") - -rust_test( - name = "bzl_version_test", - srcs = ["bzl_version_test.rs"], - data = [ - "//:MODULE.bazel", - ], - edition = "2021", - env = { - "MODULE_BAZEL": "$(rlocationpath //:MODULE.bazel)", - "VERSION": VERSION, - }, - deps = [ - "@rules_rust//tools/runfiles", - ], -) diff --git a/extensions/pyo3/test/bzl_version/bzl_version_test.rs b/extensions/pyo3/test/bzl_version/bzl_version_test.rs deleted file mode 100644 index 85b296b0df..0000000000 --- a/extensions/pyo3/test/bzl_version/bzl_version_test.rs +++ /dev/null @@ -1,40 +0,0 @@ -//! A test to ensure the rules_rust bzlmod versions match the standard versions. - -use runfiles::Runfiles; - -fn parse_module_bazel_version(text: &str) -> String { - let mut found_module = false; - for line in text.split('\n') { - if found_module { - assert!(!line.ends_with(')'), "Failed to parse version"); - if let Some((param, value)) = line.rsplit_once(" = ") { - if param.trim() == "version" { - return value.trim().trim_matches(',').trim_matches('"').to_owned(); - } - } - } else if line.starts_with("module(") { - found_module = true; - continue; - } - } - panic!("Failed to find MODULE.bazel version"); -} - -/// If this test fails it means `//:version.bzl` and `//:MODULE.bazel` need to -/// be synced up. `//:version.bzl` should contain the source of truth. -#[test] -fn module_bzl_has_correct_version() { - let version = std::env::var("VERSION").unwrap(); - let module_bazel_text = { - let r = Runfiles::create().unwrap(); - let path = runfiles::rlocation!(r, std::env::var("MODULE_BAZEL").unwrap()).unwrap(); - std::fs::read_to_string(path).unwrap() - }; - - let module_bazel_version = parse_module_bazel_version(&module_bazel_text); - - assert_eq!( - version, module_bazel_version, - "//:version.bzl and //:MODULE.bazel versions are out of sync" - ); -} diff --git a/extensions/pyo3/version.bzl b/extensions/pyo3/version.bzl deleted file mode 100644 index 81bc965b79..0000000000 --- a/extensions/pyo3/version.bzl +++ /dev/null @@ -1,3 +0,0 @@ -""""rules_rust_pyo3 version""" - -VERSION = "0.68.0" diff --git a/extensions/wasm_bindgen/MODULE.bazel b/extensions/wasm_bindgen/MODULE.bazel index fa0342b6a9..810263a43c 100644 --- a/extensions/wasm_bindgen/MODULE.bazel +++ b/extensions/wasm_bindgen/MODULE.bazel @@ -2,10 +2,10 @@ module( name = "rules_rust_wasm_bindgen", - version = "0.68.0", + version = "0.68.1", ) -bazel_dep(name = "rules_rust", version = "0.68.0") +bazel_dep(name = "rules_rust", version = "0.68.1") bazel_dep(name = "bazel_features", version = "1.32.0") bazel_dep(name = "bazel_skylib", version = "1.8.2") bazel_dep(name = "platforms", version = "1.0.0") diff --git a/version.bzl b/version.bzl index 2297210664..c13922911b 100644 --- a/version.bzl +++ b/version.bzl @@ -1,3 +1,3 @@ """The version of rules_rust.""" -VERSION = "0.68.0" +VERSION = "0.68.1"