diff --git a/modules/rules_oci/2.0.0-beta1/MODULE.bazel b/modules/rules_oci/2.0.0-beta1/MODULE.bazel new file mode 100644 index 00000000000..e420673a0b2 --- /dev/null +++ b/modules/rules_oci/2.0.0-beta1/MODULE.bazel @@ -0,0 +1,36 @@ +"bazel-contrib/rules_oci" + +module( + name = "rules_oci", + version = "2.0.0-beta1", + compatibility_level = 1, +) + +bazel_dep(name = "aspect_bazel_lib", version = "2.7.2") +bazel_dep(name = "bazel_skylib", version = "1.5.0") +bazel_dep(name = "platforms", version = "0.0.8") +bazel_dep(name = "bazel_features", version = "1.10.0") + +oci = use_extension("//oci:extensions.bzl", "oci") +oci.toolchains() +use_repo(oci, "oci_crane_toolchains", "oci_regctl_toolchains") + +register_toolchains("@oci_crane_toolchains//:all", "@oci_regctl_toolchains//:all") + +# Workaround https://github.com/aspect-build/bazel-lib/pull/832 +zstd = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "toolchains") +zstd.zstd() +use_repo(zstd, "zstd_toolchains") + +register_toolchains("@zstd_toolchains//:all") + +bazel_lib = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "toolchains") +bazel_lib.jq() +bazel_lib.tar() +use_repo(bazel_lib, "bsd_tar_toolchains", "jq_toolchains") + +# Dev dependencies + +bazel_dep(name = "rules_go", version = "0.46.0", dev_dependency = True, repo_name = "io_bazel_rules_go") +bazel_dep(name = "gazelle", version = "0.35.0", dev_dependency = True, repo_name = "bazel_gazelle") +bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.4.1", dev_dependency = True) diff --git a/modules/rules_oci/2.0.0-beta1/patches/module_dot_bazel_version.patch b/modules/rules_oci/2.0.0-beta1/patches/module_dot_bazel_version.patch new file mode 100644 index 00000000000..80128847935 --- /dev/null +++ b/modules/rules_oci/2.0.0-beta1/patches/module_dot_bazel_version.patch @@ -0,0 +1,14 @@ +=================================================================== +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -1,9 +1,9 @@ + "bazel-contrib/rules_oci" + + module( + name = "rules_oci", +- version = "0.0.0", ++ version = "2.0.0-beta1", + compatibility_level = 1, + ) + + bazel_dep(name = "aspect_bazel_lib", version = "2.7.2") diff --git a/modules/rules_oci/2.0.0-beta1/presubmit.yml b/modules/rules_oci/2.0.0-beta1/presubmit.yml new file mode 100644 index 00000000000..dedf0607fe8 --- /dev/null +++ b/modules/rules_oci/2.0.0-beta1/presubmit.yml @@ -0,0 +1,21 @@ +bcr_test_module: + module_path: "e2e/smoke" + matrix: + bazel: ["6.x", "7.x"] + # TODO(#97): add windows + platform: ["debian10", "ubuntu2004"] + tasks: + test_linux: + name: "Run test module" + bazel: ${{ bazel }} + platform: ${{ platform }} + test_targets: + - "//..." + test_macos: + name: "Run test module" + bazel: ${{ bazel }} + platform: macos + test_targets: + - "//..." + # This test requires a docker daemon, not available on BCR CI + - "-//:test" diff --git a/modules/rules_oci/2.0.0-beta1/source.json b/modules/rules_oci/2.0.0-beta1/source.json new file mode 100644 index 00000000000..327c3f9dfc6 --- /dev/null +++ b/modules/rules_oci/2.0.0-beta1/source.json @@ -0,0 +1,9 @@ +{ + "integrity": "sha256-9w8H+dDWwnXX7H08fyNtm1UroyBejzffnBElAxz5Z8w=", + "strip_prefix": "rules_oci-2.0.0-beta1", + "url": "https://github.com/bazel-contrib/rules_oci/releases/download/v2.0.0-beta1/rules_oci-v2.0.0-beta1.tar.gz", + "patches": { + "module_dot_bazel_version.patch": "sha256-fRz+lensd7vFsdThzrcarfK9+SRl9YUNCHP14R6IT6E=" + }, + "patch_strip": 1 +} diff --git a/modules/rules_oci/metadata.json b/modules/rules_oci/metadata.json index ca2f325dbd5..a9cfcb4f15a 100644 --- a/modules/rules_oci/metadata.json +++ b/modules/rules_oci/metadata.json @@ -48,7 +48,8 @@ "2.0.0-alpha3", "2.0.0-alpha4", "2.0.0-alpha5", - "2.0.0-beta0" + "2.0.0-beta0", + "2.0.0-beta1" ], "yanked_versions": {} }