diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 450349d..cb02f3d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,16 +24,16 @@ jobs: # r_version: release steps: - name: Check out repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup R - uses: r-lib/actions/setup-r@v1 + uses: r-lib/actions/setup-r@v2 with: r-version: ${{ matrix.r_version }} - name: Install additional packages if: matrix.os == 'ubuntu-latest' - run: sudo apt-get install libcurl4-openssl-dev + run: sudo apt-get install libtinfo5 libcurl4-openssl-dev - name: Create Buildbuddy certs shell: bash @@ -56,7 +56,7 @@ jobs: run: tests/run_tests.sh - name: Archive debug artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: ${{ always() }} with: name: archive-debug-artifacts diff --git a/R/internal/coverage_deps.bzl b/R/internal/coverage_deps.bzl index 5d4d092..9d4bd66 100644 --- a/R/internal/coverage_deps.bzl +++ b/R/internal/coverage_deps.bzl @@ -31,7 +31,7 @@ def r_coverage_dependencies(**kwargs): package_list = "@rules_r//R/internal:coverage_deps_list.csv", remote_repos = { # CRAN does not retain binary archives for macOS. - "CRAN": "https://cran.microsoft.com/snapshot/2022-02-28", + "CRAN": "https://packagemanager.posit.co/cran/2024-01-15/", }, **kwargs ) diff --git a/R/internal/coverage_deps_list.csv b/R/internal/coverage_deps_list.csv index b346ac1..bcbf5cd 100644 --- a/R/internal/coverage_deps_list.csv +++ b/R/internal/coverage_deps_list.csv @@ -1,19 +1,21 @@ -"Package","Version","sha256","mac_4_1_sha256" -"askpass","1.1","db40827d1bdbb90c0aa2846a2961d3bf9d76ad1b392302f9dd84cc2fd18c001f","f724f7eb2388ac00895389534c92b4f6639449b21f7b9f0c3109c0e1e34f121d" -"covr","3.5.1","a54cfc3623ea56084158ac5d7fe33f216f45191f6dcddab9c9ed4ec1d9d8ac6c","72b1efeb88ec4970129bbb7cac3aa16dd338cbcc5228bd033d88e5e04330cd8b" -"crayon","1.5.0","44122cafddcd8a35176b2a6bcab10c5f81cd5440d9e29d20091b31a0ef647954","26063add2696edb8ed7d2db9359e59575a4278f200bae1bdab19f1d6b6d79785" -"curl","4.3.2","90b1facb4be8b6315bb3d272ba2dd90b88973f6ea1ab7f439550230f8500a568","2aed012ebf5aa1b6d804fb655686a1323fe81c9f4adecf56a5e1bf8061e994ce" -"digest","0.6.29","792c1f14a4c8047745152f5e45ce7351978af8d770c29d2ea39c7acd5d619cd9","23c3d2871be2f95d8891390d1f99b2f31e55e1d62bb3f555ae9014e69729f6a7" -"httr","1.4.2","462bed6ed0d92f811d5df4d294336025f1dbff357286999d9269bfd9c20b1ef9","1494d67e7fbf91eaf76bc979e4547b2d23d24bb8baa676ade733b4542832a583" -"jsonlite","1.8.0","7b1892efebcb4cf4628f716000accd4b43bbf82b3e6ba90b9529d4fa0e55cd4c","26b9387277396f926d68f8dd52388d287328512bf57f8a5e34aaf2d9d8fb1ff9" -"lazyeval","0.2.2","d6904112a21056222cfcd5eb8175a78aa063afe648a562d9c42c6b960a8820d4","c91cc7b952ede831c3dadbc755c6fae9dd2a3ebe9cdd75970f698770ae68a8fa" -"magrittr","2.0.2","7be6fd0d0da75b92d8bad0136076da96260ee84bf639ef632a24668acdc163a6","ee6b35fbb331045fd86541035f0098127e51bb7ae7e08186469eedba81e79b5b" -"mime","0.12","a9001051d6c1e556e881910b1816b42872a1ee41ab76d0040ce66a27135e3849","16cef814356f396d13f6d554e5e0614f0ca33af8b15c2896004e25e1bb14dc04" -"openssl","1.4.6","43b832af70e71770168b997107c52c8f406f8c33e9ef9b289610bccea2f34359","36bf31c1c3e3dd2e115ad2efbf00e85ded3b9b4a2040654b3b0fa89cc13a8486" -"R6","2.5.1","8d92bd29c2ed7bf15f2778618ffe4a95556193d21d8431a7f75e7e5fc102bf48","7244f47de06e35030a21ed0836fb15c46461bf255ce51381b3beea14b0237317" -"Rcpp","1.0.8","879f9296bc045ac4ed464578723bd37fcabbbdaa30aaaf070cf953e329f678ee","11b05324ae2677f100a8a4efed9cc911b1e187a620e9381648f4e075fb3ab80c" -"rex","1.2.1","af42e649c06e4bbdba94d5a1870a7e8347903571c90cd5e5ca40f52307a3bfd6","c19029a09cfebb001ca6657cb7d8e3f72dbc9e03de712f86fce092a7a5a9c1cb" -"sys","3.4","17f88fbaf222f1f8fd07919461093dac0e7175ae3c3b3264b88470617afd0487","6474a97353cf4deb89353af95967d67873efeba30751bdb3b30d241a1d042dcc" -"withr","2.4.3","9bdac7459ccc6c2d599ecfd132a7f0aa68d958942d9fe7dbb0442c9eda129d4c","599291c992ec81e4c7f733abe5dd4a3e30660f02472811c6d5aefe6d443fc60c" -"xml2","1.3.3","cb4e9c0d31618ed67d2bfa4c7b5e52680e11612ed356a8164b541d44163c1c8d","c00bbd56fc4ae6a31bfa81ac340ec77e4ee2a724e1607206288d06a6d3ae5b22" -"yaml","2.3.5","3edf6c0554a0e184a25e8bec5721a2e66b4ab0dceb3737428e22705e52eb5140","b9e719ae3150053532a9bdeec89bdc378b7f35c5aa8e12ef46ab7e827962115e" +"Package","Version","sha256","mac_intel_4_3_sha256","mac_arm_4_3_sha256" +"askpass","1.2.0","4f2dae765d933a0eb327291cbc5bd34301246c7b04c009dd0fd92a9f61e55590","7672cca460ae93bfe5270a2039b2c95cae0ede4afb00d9e0fe3948428bf485ad","f16ea1fea1cd09a53df4b9e154e8b282d292062d3d5f1bb36d28bc3198f48347" +"cli","3.6.2","f0b910b5dcf46118acb7ab5ede068473326b34c844fdf39d2a8726f606575247","f43afe8e28d8dd7d76e4cd06c489ec132a38a0d13fa3aec1adbd46c6011ffef8","c979f598d955eaf2af58e7d73767571e848bf3b5d98a98ff3881518080eb996f" +"covr","3.6.4","d5b974664e40983ded73365fe87a3027c18664a5597a80678b89bbe251a1cc7a","3d8f5e225a3305f5f10b18ac08653ef3ebbe4748c094f537deb0d7fbc2cddcc6","c7dd1f80dac49c9e7e5659182f70c72e0980e39c55c7f022ccebe761aa9a6bc6" +"crayon","1.5.2","caea4f7ef1ed483476ec151624e6aef3f34625ff20655da08d2222260d5ada63","286db97a3974be40499b7e68b927b82e6c22730b20e56f8e0aaa8d7bef391aca","44a5b59f1bf1799fbfbdfb4477119327788189d384fbefd69cd9af9036193e07" +"curl","5.2.0","451ad2747addfc39cf2c7af121ac5e9c9559d45a5618703e47c6ac68fab5f848","51e1fdeddb80a9128617be9926a5754c1328489936011296bc4793c56b968196","0902237f6d2bb9a4e848a630558730ca8a6e9051f621bfc05b147ed98c060af3" +"digest","0.6.34","e8aa5dfd841dd332ec6c2ec0fbf41597284b7a6c0b5aa5461ddb4d1aa31e6028","0579112114c088d44138c9c0e0ca21267c83a5821c80420ae8d8f1f0f3272422","2977c5af6b87dacc15b62e6050f4c64523d08e7b192ff18c6394c4e11ca0cc9e" +"httr","1.4.7","7cd83395f99633504deb15bcf133616624fe1b52db39e66c9319c5fd057fb95b","96d86c4dc6b83e5df12aa00d627f8058a8555344cac35af17e552ea297a57f64","50a8cd1183c1f1292d7c97b2bf5f3ab1a68159b23261657a2ec70d09bf72c6a3" +"jsonlite","1.8.8","8f854ddeb6dbeb182a12aba110a2ecc9cdc2591ed5b3ec47a97ea37a5337e0b5","3306a260856cbd334bb704be62938608d97db4213e89e069001f5eaea7827630","a77e39b8f3c045b75ab4289096e5f901a638b2a765b4aa7cb2895fb84cf6731a" +"lazyeval","0.2.2","60bc3e9b5ea101688b76ac42d17ae3673382343d035f77dff7d59b8200b8e2c8","2100fe641230e214938479bb729f4c8edf817b0aabea840a7abe1954733f843a","18d8cbe8c095ab157c2c9ad1adb41e93108f469bf61f9dcbe7e69b828c7ea857" +"magrittr","2.0.3","75ff93b5a783cefb34da6b0892e8ef39a4662b408af4e62f9b5a4caef35f78a3","0e3f3e7ac8927dce96991d59d61c4ae6a46d6cbb6bc54ef199e7cc99ae772898","abb3d1ce74576e5c78e0554b1cc281986697172bb7d011946b02339dbffec721" +"mime","0.12","72e0b01a104b3a26b818372de9299a7e55cbe31ce32e03025d9706d7cbce6bea","8b8d97e72ccc9b8630179ba2f23f2b4cf89f987093db63d6315ae1ad4b8e65c7","7090b7b6e503e69ec54b3d35d23d944cbf9ddf9f31938b1646b3ee329f1be7c7" +"openssl","2.1.1","aa838b087870eb91486714754de403c8a73c0683450df1855bf1dc8bbd74cb0e","6c6336552b0d28422cb0bb29b6fb5d870c94169e9df5db8502f964613785f03d","32f28608f547df9d2cdd354f8908a7cb9ebae0f8c2baf53151d485dfceffcf75" +"R6","2.5.1","999ce4bf2ab85a76a687bebc27d3ffcf772d89f285d3cca4dfb7a0a39e88965d","1a2266513517845867acfeb3dc81d22987fd6b182aa35cefae71ff5f03c32953","36c2e41c2bb185df8cf64faf6f21266419327cee753cc1d781bcb11fceaaeffa" +"Rcpp","1.0.12","fa0cfd1067e95ba155a693399532413960c3d16c4272522db90f3d704045fe0f","44ac2ae5d1d26630005b653559fe64cad22db41d379e033ff59e37cefcd46961","b16ba840c3d9b5309158a41c8c237abafdbbbd41f0407f12742543f3c1e7a1f8" +"rex","1.2.1","8343f29fe31cb34f09cd592b30e3dfd8af3758c34013556461393762cc886a72","ea7ebdfea44d6c31457f8d207244b85425d8fc7ad79774c356a77b5fe183f4b2","cce77204c173cb429cbd350a7d5cc670baace56d300c6be67eca0e0a860550c8" +"rlang","1.1.3","fa4794ba0632b6b6e2b03e3a0301a9e4fc4449ec697f44be5b14cd76f18c334d","6425af24c86f17ad5932a941fc547ef3d40ba8558a0194dae9d55f9d4c76ed59","769b137565baa3a158352aa76d3d06117f8c5df71533fd30561ad0a8a1dcfbad" +"sys","3.4.2","f42ea04e877a77cbc1455a11c609bcb2f48fcbd6717fcad52022ed7e254ebcbe","f8e305fb144fac318d037ebfbc329375db684c2178ac558a4b8f36570441a799","b28b3cb923569d195490589253ecac7608d6a3a620d7670a3e119a0fb6a31e25" +"withr","2.5.2","d841c9a2e5f6d05dede85fff7cdbf54a845fcaab7e12e713aadf4495cbeb723b","978a36de37bed7c83a8d15e4176236dd1ea4283b29885b6db896f7a900e239a3","17b73d8c6c06ccc0101cdd14b416eae2856b0a206502f87eea7f03d2b5d7e068" +"xml2","1.3.6","872b090d1871d7e9cc9d94fb421939c069c855f889a2ccba8f89fb43cfd838b7","936889f9dbdafe323120685b97dd879a3f1a981786a29d6026be81030c0d28c0","cedd1c2245d794beef8d6a0995b65580dcbc41e3c38685b0def781ad632ffcf4" +"yaml","2.3.8","26b8dbb04cabc262067572da9f6401a55a9f8fc81536185773952a7d7649e69b","aeab7fd17010f737b8b7485a2ae34fc23354640e710ed5611cbe78928280e63d","9c75a20a4b68c76b2fe9f6225afa4c36e2a57634200f6e4e0fb81d357299c43d" diff --git a/R/internal/library.bzl b/R/internal/library.bzl index c76f176..af576fb 100644 --- a/R/internal/library.bzl +++ b/R/internal/library.bzl @@ -101,11 +101,8 @@ def _r_library_tar_impl(ctx): for f in provider.container_file_map[layer]: args.add("--file=%s=%s" % (f.path, path_prefix)) - if ctx.attr.extension: - dotPos = ctx.attr.extension.find(".") - if dotPos > 0: - dotPos += 1 - args.add("--compression=%s" % ctx.attr.extension[dotPos:]) + if ctx.attr.compression: + args.add("--compression=%s" % ctx.attr.compression) ctx.actions.run( outputs = [ctx.outputs.out], @@ -139,9 +136,9 @@ r_library_tar = rule( ], doc = "Library layers to include in the tar.", ), - "extension": attr.string(default = "tar"), + "compression": attr.string(default = "gz"), "_build_tar": attr.label( - default = Label("@bazel_tools//tools/build_defs/pkg:build_tar"), + default = Label("@rules_pkg//pkg/private/tar:build_tar"), cfg = "host", executable = True, allow_files = True, @@ -149,7 +146,7 @@ r_library_tar = rule( }, doc = "Rule to create a tar archive of the files in this library.", outputs = { - "out": "%{name}.%{extension}", + "out": "%{name}.tar" + ".%{compression}" if "%{compression}" else "", }, implementation = _r_library_tar_impl, ) diff --git a/scripts/razel.R b/scripts/razel.R index 21df832..1bf3f90 100644 --- a/scripts/razel.R +++ b/scripts/razel.R @@ -355,7 +355,15 @@ generateWorkspaceMacro <- function(local_repo_dir = NULL, if (pkg_type == "both") { r_version <- R.Version() minor_version <- gsub("\\..*", "", r_version$minor) - sha256_col <- paste0("mac_", r_version$major, "_", minor_version, "_sha256") + sys_info <- Sys.info() + stopifnot(sys_info["sysname"] == "Darwin") + stopifnot(as.integer(sub("\\..*", "", sys_info["release"])) >= 20) + if (sys_info["machine"] == "arm64") { + prefix <- "mac_arm_" + } else { + prefix <- "mac_intel_" + } + sha256_col <- paste0(prefix, r_version$major, "_", minor_version, "_sha256") if (sha256_col %in% colnames(repo_pkgs)) { repo_pkgs[, "binary_package_available"] <- !is.na(repo_pkgs[, sha256_col]) repo_pkgs[repo_pkgs[, "binary_package_available"], "sha256"] <- diff --git a/scripts/repo_management.R b/scripts/repo_management.R index 259afd5..a7f7179 100644 --- a/scripts/repo_management.R +++ b/scripts/repo_management.R @@ -23,7 +23,7 @@ # Options to also download binary archives. options("BinariesMac" = TRUE) # Binaries for Mac options("BinariesWin" = FALSE) # Binaries for Win -options("RVersions" = c("3.6", "4.0", "4.1")) # Binaries for these R versions. +options("RVersions" = c("4.3")) # Binaries for these R versions. options("ForceDownload" = FALSE) # Download packages even if src package already present in repo. # Factors in unexpected places create problems. @@ -35,11 +35,20 @@ srcContribDir <- function() { } # Returns macOS binary archive locations of repos based on R version. -macContribDir <- function(r_version) { +macContribDirs <- function(r_version) { stopifnot(r_version %in% getOption("RVersions")) - contrib_prefix <- "" if (r_version %in% c("3.4", "3.5", "3.6")) { contrib_prefix <- "el-capitan/" + } else { + if (r_version %in% c("4.3")) { + contrib_prefix <- "big-sur-x86_64/" + } else { + # Versions 4.0, 4.1 and 4.2. + contrib_prefix <- "" + } + if (r_version %in% c("4.2", "4.3")) { + contrib_prefix <- c(contrib_prefix, "big-sur-arm64/") + } } return(sprintf("/bin/macosx/%scontrib/%s", contrib_prefix, r_version)) } @@ -83,11 +92,14 @@ downloadLatestPackages <- function(pkgs, repo_dir, repos) { bin_repos <- repos[sapply(repos, isValidBinRepo, r_version)] if (getOption("BinariesMac")) { - mac_contrib_dir <- paste0(repo_dir, macContribDir(r_version)) - dir.create(mac_contrib_dir, recursive = TRUE, showWarnings = FALSE) - download.packages(pkgs, destdir = mac_contrib_dir, - contriburl = paste0(bin_repos, macContribDir(r_version)), - type = "mac.binary") + mac_contrib_dirs <- macContribDirs(r_version) + for (mac_contrib_dir in mac_contrib_dirs) { + local_dir <- paste0(repo_dir, mac_contrib_dir) + dir.create(local_dir, recursive = TRUE, showWarnings = FALSE) + download.packages(pkgs, destdir = local_dir, + contriburl = paste0(bin_repos, mac_contrib_dir), + type = "mac.binary") + } } if (getOption("BinariesWin")) { @@ -147,8 +159,16 @@ packageSHAs <- function(pkgs, repo_dir=".") { helper(file.path(repo_dir, "src", "contrib"), "sha256", ".tar.gz") for (r_version in getOption("RVersions")) { if (getOption("BinariesMac")) { - mac_contrib_dir <- paste0(repo_dir, macContribDir(r_version)) - helper(mac_contrib_dir, paste0("mac_", r_version, "_sha256"), ".tgz") + mac_contrib_dirs <- macContribDirs(r_version) + for (mac_contrib_dir in mac_contrib_dirs) { + local_dir <- paste0(repo_dir, mac_contrib_dir) + if (grepl("arm64", mac_contrib_dir)) { + prefix <- "mac_arm_" + } else { + prefix <- "mac_intel_" + } + helper(local_dir, paste0(prefix, r_version, "_sha256"), ".tgz") + } } if (getOption("BinariesWin")) { win_contrib_dir <- paste0(repo_dir, winContribDir(r_version)) @@ -180,10 +200,12 @@ repoPackages <- function(repo_dir) { updateRepoIndex <- function(repo_dir) { tools::write_PACKAGES(paste0(repo_dir, srcContribDir()), type = "source", latestOnly = FALSE) for (r_version in getOption("RVersions")) { - macDir <- paste0(repo_dir, macContribDir(r_version)) + macDirs <- paste0(repo_dir, macContribDirs(r_version)) winDir <- paste0(repo_dir, winContribDir(r_version)) - if (file.exists(macDir)) { - tools::write_PACKAGES(macDir, type = "mac.binary", latestOnly = FALSE) + for (macDir in macDirs) { + if (file.exists(macDir)) { + tools::write_PACKAGES(macDir, type = "mac.binary", latestOnly = FALSE) + } } if (file.exists(winDir)) { tools::write_PACKAGES(winDir, type = "win.binary", latestOnly = FALSE) diff --git a/tests/.bazelrc b/tests/.bazelrc index ba7fd2f..56419c0 100644 --- a/tests/.bazelrc +++ b/tests/.bazelrc @@ -1,7 +1,12 @@ +common --enable_bzlmod=false + build --workspace_status_command=stamping/workspace_status.sh build --incompatible_strict_action_env build --java_runtime_version=remotejdk_11 +# Not needed after https://github.com/grailbio/bazel-toolchain/pull/229. +build --features=-libtool + build --action_env=ZERO_AR_DATE=1 # https://github.com/bazelbuild/bazel/issues/10886 try-import buildbuddy.bazelrc diff --git a/tests/BUILD b/tests/BUILD index 0aae1be..85f99a3 100644 --- a/tests/BUILD +++ b/tests/BUILD @@ -40,6 +40,10 @@ r_toolchain( "@llvm_toolchain//:compiler-components-x86_64-linux", "@llvm_toolchain//:linker-components-x86_64-linux", ], + "@bazel_tools//src/conditions:linux_aarch64": [ + "@llvm_toolchain//:compiler-components-aarch64-linux", + "@llvm_toolchain//:linker-components-aarch64-linux", + ], "//conditions:default": None, }), makevars_site = "//cran:Makevars.gnu", @@ -70,6 +74,10 @@ r_toolchain( "@llvm_toolchain//:compiler-components-x86_64-darwin", "@llvm_toolchain//:linker-components-x86_64-darwin", ], + "@bazel_tools//src/conditions:darwin_arm64": [ + "@llvm_toolchain//:compiler-components-aarch64-darwin", + "@llvm_toolchain//:linker-components-aarch64-darwin", + ], "//conditions:default": None, }), makevars_site = "@rules_r_makevars_darwin", @@ -79,7 +87,7 @@ r_toolchain( "@llvm_toolchain_llvm//:bin/clang++", "@llvm_toolchain_llvm//:bin/llvm-cov", ], - version = "4.1", + version = "4.3", visibility = ["//visibility:public"], ) @@ -99,7 +107,7 @@ r_toolchain( "@Rnix//:bin/R", "@Rnix//:bin/Rscript", ], - version = "4.1", + version = "4.3", visibility = ["//visibility:public"], ) @@ -107,11 +115,9 @@ toolchain( name = "toolchain-linux", exec_compatible_with = [ "@bazel_tools//platforms:linux", - "@bazel_tools//platforms:x86_64", ], target_compatible_with = [ "@bazel_tools//platforms:linux", - "@bazel_tools//platforms:x86_64", ], toolchain = ":r-toolchain-linux", toolchain_type = "@rules_r//R:toolchain_type", @@ -122,11 +128,9 @@ toolchain( name = "toolchain-darwin", exec_compatible_with = [ "@bazel_tools//platforms:osx", - "@bazel_tools//platforms:x86_64", ], target_compatible_with = [ "@bazel_tools//platforms:osx", - "@bazel_tools//platforms:x86_64", ], toolchain = ":r-toolchain-darwin", toolchain_type = "@rules_r//R:toolchain_type", diff --git a/tests/WORKSPACE b/tests/WORKSPACE index 6b9da18..1da9fb1 100644 --- a/tests/WORKSPACE +++ b/tests/WORKSPACE @@ -31,9 +31,9 @@ local_repository( # R distribution from Nix. http_archive( name = "io_tweag_rules_nixpkgs", - sha256 = "7aee35c95251c1751e765f7da09c3bb096d41e6d6dca3c72544781a5573be4aa", - strip_prefix = "rules_nixpkgs-0.8.0", - urls = ["https://github.com/tweag/rules_nixpkgs/archive/v0.8.0.tar.gz"], + sha256 = "980edfceef2e59e1122d9be6c52413bc298435f0a3d452532b8a48d7562ffd67", + strip_prefix = "rules_nixpkgs-0.10.0", + urls = ["https://github.com/tweag/rules_nixpkgs/releases/download/v0.10.0/rules_nixpkgs-0.10.0.tar.gz"], ) load("@io_tweag_rules_nixpkgs//nixpkgs:repositories.bzl", "rules_nixpkgs_dependencies") @@ -44,7 +44,7 @@ load("@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl", "nixpkgs_git_repository", " nixpkgs_git_repository( name = "nixpkgs", - revision = "21.11", + revision = "23.11", ) nixpkgs_package( @@ -77,7 +77,7 @@ r_repository_list( package_list = "@rules_r_tests//cran:packages.csv", remote_repos = { # CRAN does not retain binary archives for macOS. - "CRAN": "https://cran.microsoft.com/snapshot/2022-02-28", + "CRAN": "https://packagemanager.posit.co/cran/2024-01-15/", }, rscript = rscript, ) @@ -97,10 +97,9 @@ coverage_deps() # Docker related setup. http_archive( name = "io_bazel_rules_docker", - sha256 = "59536e6ae64359b716ba9c46c39183403b01eabfbd57578e84398b4829ca499a", - strip_prefix = "rules_docker-0.22.0", + sha256 = "b1e80761a8a8243d03ebca8845e9cc1ba6c82ce7c5179ce2b295cd36f7e394bf", urls = [ - "https://github.com/bazelbuild/rules_docker/releases/download/v0.22.0/rules_docker-v0.22.0.tar.gz", + "https://github.com/bazelbuild/rules_docker/releases/download/v0.25.0/rules_docker-v0.25.0.tar.gz", ], ) @@ -122,18 +121,18 @@ load( container_pull( name = "r_base", - digest = "sha256:7d5243aa3c5010a0978a30eba38089f140ce9efd509aafe2267d794be94ccf44", - registry = "index.docker.io", - repository = "rocker/r-ver", - tag = "4.1.2", + digest = "sha256:9bfa340008f25823bfbe6dd2d8aebf01672cc4f36f19e00dfcb4a4cd7fb082ae", + registry = "ghcr.io", + repository = "rocker-org/r-ver", + tag = "4.3.2", ) http_archive( name = "com_google_protobuf", - sha256 = "3bd7828aa5af4b13b99c191e8b1e884ebfa9ad371b0ce264605d347f135d2568", - strip_prefix = "protobuf-3.19.4", + sha256 = "8ff511a64fc46ee792d3fe49a5a1bcad6f7dc50dfbba5a28b0e5b979c17f9871", + strip_prefix = "protobuf-25.2", urls = [ - "https://github.com/protocolbuffers/protobuf/archive/v3.19.4.tar.gz", + "https://github.com/protocolbuffers/protobuf/releases/download/v25.2/protobuf-25.2.tar.gz", ], ) @@ -145,24 +144,34 @@ protobuf_deps() # Define custom toolchains to test if R toolchains work correctly. # See BUILD for actual definition of the R toolchains. http_archive( - name = "com_grail_bazel_toolchain", - sha256 = "148e871e785ae699e6adfbb07afea241ee668dbc0c530e72a47356885fce0cb7", - strip_prefix = "bazel-toolchain-0.7", - urls = [ - "https://github.com/grailbio/bazel-toolchain/archive/0.7.tar.gz", - ], + name = "toolchains_llvm", + canonical_id = "0.10.3", + sha256 = "b7cd301ef7b0ece28d20d3e778697a5e3b81828393150bed04838c0c52963a01", + strip_prefix = "toolchains_llvm-0.10.3", + url = "https://github.com/grailbio/bazel-toolchain/releases/download/0.10.3/toolchains_llvm-0.10.3.tar.gz", ) -load("@com_grail_bazel_toolchain//toolchain:rules.bzl", "llvm_toolchain") +load("@toolchains_llvm//toolchain:deps.bzl", "bazel_toolchain_dependencies") + +bazel_toolchain_dependencies() + +load("@toolchains_llvm//toolchain:rules.bzl", "llvm_toolchain") llvm_toolchain( name = "llvm_toolchain", cxx_builtin_include_directories = { + "linux-aarch64": ["/usr/share/R/include"], "linux-x86_64": ["/usr/share/R/include"], + "darwin-aarch64": ["/Library/Frameworks/R.framework/Headers"], "darwin-x86_64": ["/Library/Frameworks/R.framework/Headers"], }, - llvm_version = "13.0.0", + llvm_version = "16.0.0", stdlib = { + "linux-aarch64": "stdc++", "linux-x86_64": "stdc++", }, ) + +load("@llvm_toolchain//:toolchains.bzl", "llvm_register_toolchains") + +llvm_register_toolchains() diff --git a/tests/container/BUILD b/tests/container/BUILD index 6489066..0b1b511 100644 --- a/tests/container/BUILD +++ b/tests/container/BUILD @@ -16,13 +16,13 @@ load("@rules_r//R:defs.bzl", "r_library_tar") r_library_tar( name = "library_archive", - extension = "tar.gz", layers = [ "external", "tools", ], library = "//:library", library_path = "rules_r/r-libs", + tags = ["manual"], ) ## Image related tests @@ -35,7 +35,10 @@ r_library_image( directory = "rules_r", library = "//:library", library_path = "r-libs", - tags = ["no-remote-cache"], + tags = [ + "manual", + "no-remote-cache", + ], ) sh_test( @@ -48,7 +51,10 @@ sh_test( ":library_archive", ":library_image", ], - tags = ["no-remote-cache"], + tags = [ + "manual", + "no-remote-cache", + ], ) r_binary_image( @@ -58,7 +64,10 @@ r_binary_image( # TODO(siddharthab): Providing `-i` here (as in the default value) makes # the docker daemon hang when starting the container on macOS. docker_run_flags = "--rm", - tags = ["no-remote-cache"], + tags = [ + "manual", + "no-remote-cache", + ], ) r_binary_image( @@ -69,5 +78,8 @@ r_binary_image( "@R_bitops", "@R_R6", ], - tags = ["no-remote-cache"], + tags = [ + "manual", + "no-remote-cache", + ], ) diff --git a/tests/cran/packages.csv b/tests/cran/packages.csv index 0759df4..f8bbdbe 100644 --- a/tests/cran/packages.csv +++ b/tests/cran/packages.csv @@ -1,39 +1,40 @@ -"Package","Version","sha256","mac_4_1_sha256" -"assertthat","0.2.1","85cf7fcc4753a8c86da9a6f454e46c2a58ffc70c4f47cac4d3e3bcefda2a9e9f","a9153313fdc2cc94f16facd14fac5c8ecd06cecbd3a4db24e59c7e95c359bf22" -"bitops","1.0-7","e9b5fc92c39f94a10cd0e13f3d6e2a9c17b75ea01467077a51d47a5f708517c4","f2e7db15839ff68ee79944e0aacad9dc1d1982917ce580920ed4c0cb2b55d79a" -"brio","1.1.3","eaa89041856189bee545bf1c42c7920a0bb0f1f70bb477487c467ee3e8fedcc6","cd18b764831828adc8b0ddb3712ab1c8251c26c33bd7ba0adbc2a187529bebe5" -"callr","3.7.0","d67255148595c6d0ba4c4d241bc9f6b5e00cafe25fdc13e38c10acc38653360a","2148b25d19e20e2eafed8b2271019b6c83659617b104418c689d235f6388b967" -"cli","3.2.0","cd5a1b754d09de33f088f25ecdb0494100f9a42bc0a66622bfd7d8ec5498e862","5807666b0400b319b40703617ab89c1989425ee8d68a452d1ace67484e6eb522" -"crayon","1.5.0","44122cafddcd8a35176b2a6bcab10c5f81cd5440d9e29d20091b31a0ef647954","26063add2696edb8ed7d2db9359e59575a4278f200bae1bdab19f1d6b6d79785" -"desc","1.4.0","8220e4c706449b8121b822e70b1414f391ef419aed574836a234c63b83e5d649","992b2da6871405787ff3900c98b33578bd856a92316c794082e4df1cde66c1be" -"diffobj","0.3.5","d860a79b1d4c9e369282d7391b539fe89228954854a65ba47181407c53e3cf60","af2b70ea1a411cb1da09210cdfdf67940135b726633d7ab7014999d09d8546ce" -"digest","0.6.29","792c1f14a4c8047745152f5e45ce7351978af8d770c29d2ea39c7acd5d619cd9","23c3d2871be2f95d8891390d1f99b2f31e55e1d62bb3f555ae9014e69729f6a7" -"ellipsis","0.3.2","a90266e5eb59c7f419774d5c6d6bd5e09701a26c9218c5933c9bce6765aa1558","143b110b3181aec6266b393770b8dfe804e8047da782152c79e906b49307776c" -"evaluate","0.15","885aee530a8b6aa7fd3acaa1ecd94ab58b71038c879ca37405f948e105907c5d","3c9d25395f6c3f6eb51777a3efb7541863a90fed31ece4cb4343baaf4292945a" -"fansi","1.0.2","d1e2cf2e10613abe19071e3dab7c564ebcf85ad13cbee25fa1999267af01b557","9cde03b45f8f5ba96bb0a3a725e69ebc20b48fcc0d2235d82d7ef0f5a7185d45" -"glue","1.6.2","9da518f12be584c90e75fe8e07f711ee3f6fc0d03d817f72c25dc0f66499fdbf","162d6521d65a0452fce5eb995b9a94b9c82798c8f0eb1c017132c12542708d7a" -"jsonlite","1.8.0","7b1892efebcb4cf4628f716000accd4b43bbf82b3e6ba90b9529d4fa0e55cd4c","26b9387277396f926d68f8dd52388d287328512bf57f8a5e34aaf2d9d8fb1ff9" -"lifecycle","1.0.1","1da76e1c00f1be96ca34e122ae611259430bf99d6a1b999fdef70c00c30f7ba0","26c71d5695bd275efe8674db73cdc4c32ed8c00955a085825a4363d1146acfa3" -"magrittr","2.0.2","7be6fd0d0da75b92d8bad0136076da96260ee84bf639ef632a24668acdc163a6","ee6b35fbb331045fd86541035f0098127e51bb7ae7e08186469eedba81e79b5b" -"pillar","1.7.0","7841f89658cc8935568c0ff24dc480b4481bac896de2f6447050abc4360a13bb","67d5af6fa7e7e28fae4676404b7e2032c888e4f80bce618481b6ff52c21c8ebc" -"pkgbuild","1.3.1","7c6a82d1e6b19e136a7d16095743c50cd7b6340eeda594e4a8e14d74972ddb48","21184f0266e48d45de40ef0bf421b42b6325c633fbbab012929bc22a875c4d87" -"pkgconfig","2.0.3","330fef440ffeb842a7dcfffc8303743f1feae83e8d6131078b5a44ff11bc3850","1886ec9c44f81cd879560b3fd578c4f858141ff2f8e8a6070bea47c2bc1aede4" -"pkgload","1.2.4","d6912bc824a59ccc9b2895c3cf3b08a3ff310a333888bb8e90d1a6ce754dd90f","e32d6209dd991fd0adf9bb7ca52fed0d922d647636713f78937771a45dbc5ae3" -"praise","1.0.0","5c035e74fd05dfa59b03afe0d5f4c53fbf34144e175e90c53d09c6baedf5debd","3db31132d7d46a9fe35ac1d9bacdd542fb01372ba2a8abe22c9f11958658d071" -"prettyunits","1.1.1","9a199aa80c6d5e50fa977bc724d6e39dae1fc597a96413053609156ee7fb75c5","0077716856b30335f989e3b43743b8afb7dc495cb6ecbdb850cbbdf90ae693b0" -"processx","3.5.2","ed6f2d1047461c6061e6ed58fb6de65a289b56009867892abad76c6bba46fc2b","8ad28ba536adf98439144469abe3745cdd9a81b2c7774e5a5f3d768d4973b76a" -"ps","1.6.0","89ad7ddc5e0818bccacfd0673ddf2da0892ac2a3b4d3a821e40884ab1e96bf31","5d974a914cf10edd1e55bb623cf8f4b4e195ab4a74b7c27b940e9058d9fef852" -"R6","2.5.1","8d92bd29c2ed7bf15f2778618ffe4a95556193d21d8431a7f75e7e5fc102bf48","7244f47de06e35030a21ed0836fb15c46461bf255ce51381b3beea14b0237317" -"Rcpp","1.0.8","879f9296bc045ac4ed464578723bd37fcabbbdaa30aaaf070cf953e329f678ee","11b05324ae2677f100a8a4efed9cc911b1e187a620e9381648f4e075fb3ab80c" -"RCurl","1.98-1.6","6cb56864ac043195b658bbdb345518d561507d84ccd60362866e970c2f71d1a2","8745c6f42157579e0f5dd028a53372c2a0bf171e1a4693f11e9c2a2e6beafc6e" -"rematch2","2.1.2","fe9cbfe99dd7731a0a2a310900d999f80e7486775b67f3f8f388c30737faf7bb","317b863b69a255121959d5060170c5b0df3895b49712ea775bb5ecd0be04ec78" -"rlang","1.0.1","e59fd5c0f7530dbe329aa01621f6ef5a6474ff3ec96de0c0d24018fc2f21ad7f","151903e04710d36199dd12fd9aa5083350b7c5bd8af71391eebddbeedfd66f1b" -"rprojroot","2.0.2","5fa161f0d4ac3b7a99dc6aa2d832251001dc92e93c828593a51fe90afd019e1f","3c319076a3dc8a62d5f61554224d0fc4ffb4f0387fda1660ad7c68b5d3328f2c" -"RProtoBuf","0.4.18","50343f3c4c58f841985634f4b059eda7bfb365a939afaadf8c5d4a1fd65aeec9","7833fc75153abea237dab99249e7bf9a4dec65ccb5c7713821d8846f03d976df" -"rstudioapi","0.13","aac35bbdcb4a8e8caba943bc8a2b98120e8940b80cd1020224bb1a26ff776d8b","e65040c6000fe55cfd3b0316a8102ae2d38fe2370332818d06cb9d3a433d7aae" -"testthat","3.1.2","ed41a6168ca22869b6aebe1e5865bb2f5338a7c35ca0a13cf69ac2f5c6aeb659","541c4bd915a0f346309b909013c7e645cd1bca32798d3b899fa02b88edcd24b7" -"tibble","3.1.6","5b33d909f146ebad38e262f6a57cb91ab70bfe240c2af01004beec11b3898292","e9aaf3ac4535178e678216ef8eb65ee4e3830fe9584e519b56f76f4117348936" -"utf8","1.2.2","a71aee87d43a9bcf29249c7a5a2e9ca1d2a836e8d5ee3a264d3062f25378d8f4","a667d382cd8e697cfd7cae0481ea0cb57b9067a440665d56bce031c81f507fb4" -"vctrs","0.3.8","7f4e8b75eda115e69dddf714f0643eb889ad61017cdc13af24389aab2a2d1bb1","e06d33aca6c8676d48b37bcd933450f871a1cd5b51e377a2c62b0ca5bc249f85" -"waldo","0.3.1","ec2c8c1afbc413f8db8b6b0c6970194a875f616ad18e1e72a004bc4497ec019b","3a87369ff3a7e091d0a32464467675ddfee28c539c2356a1adbd81a40506ec5c" -"withr","2.4.3","9bdac7459ccc6c2d599ecfd132a7f0aa68d958942d9fe7dbb0442c9eda129d4c","599291c992ec81e4c7f733abe5dd4a3e30660f02472811c6d5aefe6d443fc60c" +"Package","Version","sha256","mac_intel_4_3_sha256","mac_arm_4_3_sha256" +"assertthat","0.2.1","87393da61655bda2ce1933c6c9eb770f4b549713994f3536c21586092535de22","49da37b64b8449097d30218c87cb12e6c7d0574966972c0c87046575a61faf9b","82e9a4bc62360111924795199e797fc14bbc397cff334773eeec91275382ca17" +"bitops","1.0-7","abb7104ab91c618ea6cf311bf801ac4ac4eec1abfeb1f4914162d504b379a062","38cadd743e6140178765849318a3a20fb9dd068b78532ad8e8723be02548ccb8","893607480dfeb7af9684e4168f3a5590be6d5e330b035511a5b712df52f79980" +"brio","1.1.4","7705445ac0554ce9fcc5346b7da3bf3e9d27e96024adde0510dfb1b913ba952b","6c03d935c558016371f4f7ab77fa6b2800e220951ca8d6bf742e5f5e5bfcb870","509a69cb8df37f40e961dbe78a16168afd3b3cae58bc124524e20d7b7a066059" +"callr","3.7.3","bc73b0f41dcd51f0ac67ddf7053146b3c224fb12e32f2255509c3beb176943f1","909d8515ed5dc81cb993fef2dbcf6432ed83329cd6f14bdf66ac4b194b2ad96c","a8a3fbd097788c1c0f836f93b4a539a857e5cf99399322cf4b7497c4991cf179" +"cli","3.6.2","f0b910b5dcf46118acb7ab5ede068473326b34c844fdf39d2a8726f606575247","f43afe8e28d8dd7d76e4cd06c489ec132a38a0d13fa3aec1adbd46c6011ffef8","c979f598d955eaf2af58e7d73767571e848bf3b5d98a98ff3881518080eb996f" +"crayon","1.5.2","caea4f7ef1ed483476ec151624e6aef3f34625ff20655da08d2222260d5ada63","286db97a3974be40499b7e68b927b82e6c22730b20e56f8e0aaa8d7bef391aca","44a5b59f1bf1799fbfbdfb4477119327788189d384fbefd69cd9af9036193e07" +"desc","1.4.3","ce0222ca4d15013a5bd6243c96d0b5373df0632bab96607a94e7e08b82db1b20","2d02cad175801963365b01b9943400ac55bdfec40e6b3a27fc5340b5ec3a9735","62e01a2205f065a6e620b1e6b3843792c8b1dadd7a85747dd67c3d92eb2420cd" +"diffobj","0.3.5","98d0f34957b4ca2bb5d4881fe234607092a551c48a1c832846ce8bcc3bcf8591","b4edd5dc584d9cbc10cb764fdc93d6508e8fac49b7cf06d9731457eac9ee6e97","7e95714c64de1f8176411b31515aaa6a6a4adb629b3057bed02184c9bdffdee3" +"digest","0.6.34","e8aa5dfd841dd332ec6c2ec0fbf41597284b7a6c0b5aa5461ddb4d1aa31e6028","0579112114c088d44138c9c0e0ca21267c83a5821c80420ae8d8f1f0f3272422","2977c5af6b87dacc15b62e6050f4c64523d08e7b192ff18c6394c4e11ca0cc9e" +"ellipsis","0.3.2","ba6e65cd295aeee6352e85a6120da70a09c0a9ae04e06a45fb6c8019570b4548","094472bdca9f463bc37135b70f02905c6b9493d6dcf4ef02ba6598f87b59303f","b7587bc7b88f4ccdcdd6025ce89b9029bd4896a7c05edcccaea3d46f5327e8f0" +"evaluate","0.23","a81b047f1505f29134ad9b26bc205630b24ae410b9e1e828b9efdb2a130eff2b","82c80d34fd363ce13b013ad632db54624ccf3507e3221613564416c965bae446","74b9e9d6e9604cd8edd6cfe7487779e94b87e403bbe61806db2c4569f2ba07cf" +"fansi","1.0.6","318ed891e147fe6b9e81349705cf16b624571f68b0a2dccec711b382e05af4d0","befc76331694e2b8074eb55a2452b4b950a2521677aee2d16538b8c298d78527","eb445c02616b6a15e4093fe9cd52e7dda3aeb892c8fcafc17c4eeb42cc45f6a3" +"fs","1.6.3","796925deaf1e21eaef17472aecdc3dd99fc5ec61297224b2d1e8b8c02c0702b4","fe1c5b6409130a8cf1c262de15caa5649aff492810e38048f3fc834fe0274cf8","33164c4cddd5892f29970e07b317907d7ca8dd1e2737fed6f1f56210dc8a51ff" +"glue","1.7.0","b4b7ea2b45a137a7ebd627ea59d17fd02c82b00890e9c03b088bcc6d7998b752","553bba3947f9ef96be9736e4b87cc2cb5fe4ee8322df8d9cde9fb7cca982ebc7","6b40af3b7b3642eacb524bffdba7f0b50e30d5718641b5a14733f3a81fdafd85" +"jsonlite","1.8.8","8f854ddeb6dbeb182a12aba110a2ecc9cdc2591ed5b3ec47a97ea37a5337e0b5","3306a260856cbd334bb704be62938608d97db4213e89e069001f5eaea7827630","a77e39b8f3c045b75ab4289096e5f901a638b2a765b4aa7cb2895fb84cf6731a" +"lifecycle","1.0.4","f1ffeddde5dc26dbc7ff42567e45c86a185c9e0f8afbf32b5a6fb44a58ce3011","2ae0d7173ac455be6ca9292a4f71ab72f3b45a79e489b6d44a07c6f4240f6c65","ad58c3804a44682d7ce99b21105a7da0f61c2616ae12d8922acae922d5faa483" +"magrittr","2.0.3","75ff93b5a783cefb34da6b0892e8ef39a4662b408af4e62f9b5a4caef35f78a3","0e3f3e7ac8927dce96991d59d61c4ae6a46d6cbb6bc54ef199e7cc99ae772898","abb3d1ce74576e5c78e0554b1cc281986697172bb7d011946b02339dbffec721" +"pillar","1.9.0","240c65b2740d7771423f68dd17e42eb2bc4991cfb1b22ab63aa8ad4994978087","6c6c9b47b4aebe4313ad8a2d96b03fdd208b540cd3ae030ebbfb1b061c94f001","558e5165c2383a2bc6b7ef608f802c5223ee0a94189cbe85f5ec5e1e619abe4b" +"pkgbuild","1.4.3","cf97b760767003a22b30cdf0eb9edcf1c65c984ed5760b655d372f26fa86910f","ea610482d55045067b125c350ef41691d3d1d9d49366cd351b030bdf58e4a82d","3c04ff0781b1bf135df2ed7b14cedaf0f8912888ecd3b2f2a1d34d20d1183b4f" +"pkgconfig","2.0.3","5c66598af8f3a298afb300170270cef161ea7df84ed432e1e2d615de4bac808d","6d663fa63119e62aac9005e003d92c1d3cf9e6af333756e657457bc9d4132097","67622560a61851c0da308077e2c7d1b3c85f2f04c1298ebfdb24480223b67c4d" +"pkgload","1.3.3","5ead2ffad89b0b2f931a7dde2e972c70fd61a6cf2ea9ab743ab59a3ac104c284","8683b5d946eb3425d45994a92baae423d1bc3e961c653f638508a71a228061d9","923cfcbdce62e862f0e7a2393b22a576d442d856b806ee472fc76625941ff7f8" +"praise","1.0.0","81c61e97f46f16da751fda19143002dc65c3b43fddbb85ae5106a830259fed00","81abb0bf1004137f2329539c35dba7322be0e67311464b8fa615268bef5639a5","dc606c11b5f81896d04c269609f6c5c6e2c1d66c3621fe033123880e1bb6df26" +"prettyunits","1.2.0","2c02bb99b8e14f3ee1cdfcc10b08257edf90dc8ea3b67f98076ef749eee690d3","b270f94482f1c678f327b0145e09909bc670178f6f97943b30e79a9c4bd1c4a5","c746fe26ad9f4424073ea7370824264e50bbe1097c44a556433368199fdc46ec" +"processx","3.8.3","a5166c1925b3c1bfbf744bd56aad16628cdf712c9d45d27173ee28f6c512e1f8","5888c6cb9ca2924150c0ac6361fd010301d9e690e43c397e406804c4d21caae7","704e630feaf8423c143d7fdc690e4a5fe2e9cd14828eb0d7d5a78fbf66dc94a3" +"ps","1.7.5","a9c27834fbfb1016fd9c98408e60cd093e9ca068e9b69bb9e3c215f2823a6b44","443132f71083dda71973b8dce7ddb37990be5f7ac5f4783e53d6a938f74a041b","3f798d5b367b4bfaa9293214bfb54c990e4d00b26e5443aff2d6a20c31e43391" +"R6","2.5.1","999ce4bf2ab85a76a687bebc27d3ffcf772d89f285d3cca4dfb7a0a39e88965d","1a2266513517845867acfeb3dc81d22987fd6b182aa35cefae71ff5f03c32953","36c2e41c2bb185df8cf64faf6f21266419327cee753cc1d781bcb11fceaaeffa" +"Rcpp","1.0.12","fa0cfd1067e95ba155a693399532413960c3d16c4272522db90f3d704045fe0f","44ac2ae5d1d26630005b653559fe64cad22db41d379e033ff59e37cefcd46961","b16ba840c3d9b5309158a41c8c237abafdbbbd41f0407f12742543f3c1e7a1f8" +"RCurl","1.98-1.14","8b5112e5961fa3653100e3eb7fa5e1ee862b04ea270536e87972158c35374bbb","1fcb3a8a0cbf41a72737a69a15c832cfdc3435358d9fc6568079072cc4acffa0","884fa2ffa9af8d9ea643d98475650aa16a967f165ad9b8b3680d2e23d38b0207" +"rematch2","2.1.2","ead33a0a4f9aa7495545f3a728e77b5ff0a6921c73fece4a245fedb37c1bb842","767060d15166f401b03adfd7b713e93e02c2772901390fd8fde7ee86e5f82911","f98eaea75038d9caab63903121bfb1f1439df1b7ab6d22a96c75716bffa5bdf3" +"rlang","1.1.3","fa4794ba0632b6b6e2b03e3a0301a9e4fc4449ec697f44be5b14cd76f18c334d","6425af24c86f17ad5932a941fc547ef3d40ba8558a0194dae9d55f9d4c76ed59","769b137565baa3a158352aa76d3d06117f8c5df71533fd30561ad0a8a1dcfbad" +"rprojroot","2.0.4","816aa343cd2c6d95ad5e04e881f82f8f2898e2cc50b9fc16da48a22f4466a876","f0a32bceb78c9b82ed50274d64aff3042b475db992757a4e260b6125a6c8d8fe","5fb6c9cf6bb5d1b532b3ea14c86d47404962a866215c4ae5b7dae60b4e8d34ff" +"RProtoBuf","0.4.21","cd67ce36490b2ecbba71c2407f5f685a9d2f5c7b4682d97a1ccbb0c2c9c3fad7","eb0444eaf042323543d23dd9d71a795975e5653dfc2ff42c0cd3a352d1fb0120","7f2c7cc88e61cc1badd1b75298aa4661b466750d54ff8cc3229ec294e33141dc" +"rstudioapi","0.15.0","255fa234f6521431447b0d58736e822e2c68782e1ef3668577ea28a537f68976","f94512367cb809d333b827929f299b9d085f275b9746cc42bacba9f30fb1edc4","2fd8539942258882d5cdec3f6c83d0f5470c3d0252b3ff4eeab359ff3c2693bb" +"testthat","3.2.1","647cc259298380bb707629e274fbefaee6f28a7d3de296ce9d5779ca54013ba5","812f00427411399ea5bbd1092e214fea85578e06cfd7d32599193e719bb34b56","f9c62010e20d0226774281a324fe8023bfd1854a94d7c38e5118ecd03b4a0b73" +"tibble","3.2.1","3f8ba09d7ec029a7c6cd4b91e1d92d15f1bd94096cf91534a08b2dcd58e496fe","f0bf70558b11ab630db5dd14d8b844f8feee8dcfa57984fddf14dd929baa2a6e","1c4c23f2a6ea98587497a9c6cb588b59987b8c4113633cc04c12aa224cde6d97" +"utf8","1.2.4","6c774ac698e897703a88b868ecdb4daf6e8a8ebe295c9c31afec6f366d702d1f","f4f202aa97a29ff48cd326b99540cc44de2af775f570a2d727a84027be72b9b3","bdf0cb17bc5733adeff753990a70e2bc385cd13cc34ac2447c008c4a46d40818" +"vctrs","0.6.5","bf03b07e78fdf8e7ce39d85096d33d71a961cb40aa39ccd1fd8bbd441eac09f1","a0f084ab7e9720d2087e5340ccf66528f9ba4c29297f17f9e84ea03008f66477","36aaafd706b3216f26f11f957666b144b4eda118cc4da1f638c2f06481184cd7" +"waldo","0.5.2","01913a381309f59e4b8e6a1db7d9719cc299b3b20f04ff04abf250ad4ce0d767","a1a7a76d273d85d89fc0f9ee5aab901f4fa78d497665a3b21f721301c1cc6e39","d419ae232fd1d121a62783472ee6333e4a45516629c0eb1a0bfac656383daaa1" +"withr","2.5.2","d841c9a2e5f6d05dede85fff7cdbf54a845fcaab7e12e713aadf4495cbeb723b","978a36de37bed7c83a8d15e4176236dd1ea4283b29885b6db896f7a900e239a3","17b73d8c6c06ccc0101cdd14b416eae2856b0a206502f87eea7f03d2b5d7e068" diff --git a/tests/packages/exampleC/BUILD b/tests/packages/exampleC/BUILD index 0f62175..dad5b5d 100644 --- a/tests/packages/exampleC/BUILD +++ b/tests/packages/exampleC/BUILD @@ -79,7 +79,6 @@ cc_library( "src/lib/rcpp.cc", ], hdrs = ["src/lib/rcpp.h"], - # NOTE: @platforms//os:... targets work in select statement from bazel 4.0.0+. copts = select({ # NOTE: The include path requirements here are met through setup-bazel.sh. # When using Xcode toolchains, /Library include paths work out of the box from bazel 4.0.0+. diff --git a/tests/setup-bazel.sh b/tests/setup-bazel.sh index 9f242bb..f8ace95 100644 --- a/tests/setup-bazel.sh +++ b/tests/setup-bazel.sh @@ -19,8 +19,18 @@ os="$(uname -s | tr "[:upper:]" "[:lower:]")" readonly os +arch="$(uname -m)" +if [[ ${arch} == "x86_64" ]]; then + arch="amd64" +elif [[ ${arch} == "aarch64" ]] || [[ ${arch} == "arm64" ]]; then + arch="arm64" +else + echo >&2 "Unknown architecture: ${arch}" +fi +readonly arch + # Use bazelisk to catch migration problems. -readonly url="https://github.com/bazelbuild/bazelisk/releases/download/v1.11.0/bazelisk-${os}-amd64" +readonly url="https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-${os}-${arch}" bazel="${TMPDIR:-/tmp}/bazelisk" readonly bazel diff --git a/tests/workspaceroot/.bazelrc b/tests/workspaceroot/.bazelrc new file mode 100644 index 0000000..465bd4c --- /dev/null +++ b/tests/workspaceroot/.bazelrc @@ -0,0 +1,11 @@ +common --enable_bzlmod=false + +build --incompatible_strict_action_env +build --java_runtime_version=remotejdk_11 + +# Not needed after https://github.com/grailbio/bazel-toolchain/pull/229. +build --features=-libtool + +build --action_env=ZERO_AR_DATE=1 # https://github.com/bazelbuild/bazel/issues/10886 + +try-import ../buildbuddy.bazelrc diff --git a/tests/workspaceroot/expected_coverage.xml b/tests/workspaceroot/expected_coverage.xml index 8367a9f..e2cfc3d 100644 --- a/tests/workspaceroot/expected_coverage.xml +++ b/tests/workspaceroot/expected_coverage.xml @@ -1,17 +1,18 @@ - + + - + - + diff --git a/utils/update_package_lists.R b/utils/update_package_lists.R index 0ba5513..d7ea265 100755 --- a/utils/update_package_lists.R +++ b/utils/update_package_lists.R @@ -3,8 +3,8 @@ git_root <- system2("git", c("rev-parse", "--show-toplevel"), stdout = TRUE) source(file.path(git_root, "scripts/repo_management.R")) -options("RVersions" = c("4.1")) -options("repos" = "https://cran.microsoft.com/snapshot/2022-02-28") +options("RVersions" = c("4.3")) +options("repos" = "https://packagemanager.posit.co/cran/2024-01-15/") do <- function(path) { tmp_repo <- file.path(tempdir(), "/repo")