diff --git a/.bazelci/config.yaml b/.bazelci/config.yaml index 40f5646b3..d657d4705 100644 --- a/.bazelci/config.yaml +++ b/.bazelci/config.yaml @@ -103,7 +103,7 @@ tasks: test_targets: *rbe_targets macos_examples_standalone: name: Examples (spawn_strategy=standalone) - platform: macos + platform: macos_arm64 working_directory: examples macos_targets: &macos_targets_standalone - "//..." @@ -128,6 +128,23 @@ tasks: - "--noincompatible_enable_cc_toolchain_resolution" - "--noenable_bzlmod" - "--enable_workspace" + macos_arm64_examples: + name: Examples (arm64) + platform: macos_arm64 + working_directory: examples + macos_targets: &macos_arm64_targets + - "//..." + - "//:third_party_examples_macos_tests" + - "-//cmake_android/..." + # Remove tests that depend on shared libraries, which currently doesn't work on MacOS - https://github.com/bazelbuild/bazel/issues/10254 + - "-@rules_foreign_cc_examples_third_party//curl:curl_test" + - "-@rules_foreign_cc_examples_third_party//openssl:openssl_test" + build_targets: *macos_arm64_targets + test_targets: *macos_arm64_targets + build_flags: + - "--enable_workspace" + test_flags: + - "--enable_workspace" macos_examples: name: Examples platform: macos @@ -202,6 +219,12 @@ tasks: working_directory: test/standard_cxx_flags_test test_targets: - "//:flags_test" + macos_arm64_flags: + name: Flags (arm64) + platform: macos_arm64 + working_directory: test/standard_cxx_flags_test + test_targets: + - "//:flags_test" windows_flags: name: Flags platform: windows @@ -220,6 +243,12 @@ tasks: working_directory: test/detect_root_test test_targets: - "//:tests" + macos_oarm64_detect_root: + name: Detect root (arm64) + platform: macos_arm64 + working_directory: test/detect_root_test + test_targets: + - "//:tests" macos_detect_root: name: Detect root platform: macos diff --git a/examples/third_party/openssl/openssl_repositories.bzl b/examples/third_party/openssl/openssl_repositories.bzl index bc63791cd..6f783e84c 100644 --- a/examples/third_party/openssl/openssl_repositories.bzl +++ b/examples/third_party/openssl/openssl_repositories.bzl @@ -8,12 +8,10 @@ def openssl_repositories(): http_archive, name = "openssl", build_file = Label("//openssl:BUILD.openssl.bazel"), - sha256 = "9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f", - strip_prefix = "openssl-1.1.1o", + sha256 = "", + strip_prefix = "openssl-1.1.1w", urls = [ - "https://mirror.bazel.build/www.openssl.org/source/openssl-1.1.1o.tar.gz", - "https://www.openssl.org/source/openssl-1.1.1o.tar.gz", - "https://github.com/openssl/openssl/archive/OpenSSL_1_1_1o.tar.gz", + "https://github.com/openssl/openssl/releases/download/OpenSSL_1_1_1w/openssl-1.1.1w.tar.gz", ], ) @@ -32,9 +30,8 @@ def openssl_repositories(): maybe( http_archive, name = "rules_perl", - sha256 = "5cefadbf2a49bf3421ede009f2c5a2c9836abae792620ed2ff99184133755325", - strip_prefix = "rules_perl-0.1.0", + strip_prefix = "rules_perl-0.2.3", urls = [ - "https://github.com/bazelbuild/rules_perl/archive/refs/tags/0.1.0.tar.gz", + "https://github.com/bazelbuild/rules_perl/archive/refs/tags/0.2.3.tar.gz", ], )