Skip to content

Commit

Permalink
Bazel 8 compatibility for `rules_{gzip,bzip2,xz,zstd,curl,squashfs,di…
Browse files Browse the repository at this point in the history
…ff}`, `ape` and `download_utils` (#3270)

Upstream modules now have multiple Bazel version testing in the CI now.

#3260
  • Loading branch information
mattyclarkson authored Nov 27, 2024
1 parent 1a00e04 commit db1f139
Show file tree
Hide file tree
Showing 40 changed files with 991 additions and 10 deletions.
385 changes: 385 additions & 0 deletions modules/ape/1.0.0-beta.16/MODULE.bazel

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions modules/ape/1.0.0-beta.16/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
bcr_test_module:
module_path: e2e
matrix:
bazel:
- 7.x
- 8.0.0rc4
platform:
- centos7_java11_devtoolset10
- debian10
- debian11
- ubuntu2004
- ubuntu2204
- fedora39
- macos
- windows
tasks:
e2e_tests:
name: Run end-to-end Tests
bazel: ${{ bazel }}
platform: ${{ platform }}
test_targets:
- "//..."
5 changes: 5 additions & 0 deletions modules/ape/1.0.0-beta.16/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"url": "https://gitlab.arm.com/bazel/ape/-/releases/v1.0.0-beta.16/downloads/src.tar.gz",
"integrity": "sha512-gdqBC732gZTEJZUe0c0ZHHF3QbmPvA07leuyINv/tR1nK+lhCFZZTJ5W+DlJG3Hcyh2R088T7TqF+D0XhKQtJg==",
"strip_prefix": "ape-v1.0.0-beta.16"
}
3 changes: 2 additions & 1 deletion modules/ape/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"1.0.0-beta.12",
"1.0.0-beta.13",
"1.0.0-beta.14",
"1.0.0-beta.15"
"1.0.0-beta.15",
"1.0.0-beta.16"
],
"maintainers": [
{
Expand Down
15 changes: 15 additions & 0 deletions modules/download_utils/1.0.0-beta.5/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
module(
name = "download_utils",
version = "1.0.0-beta.5",
bazel_compatibility = [
">=7.1.0",
],
compatibility_level = 1,
)

bazel_dep(name = "rules_diff", version = "1.0.0-beta.6", dev_dependency = True)
bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.18", dev_dependency = True)

separator = use_repo_rule("//lib:separator.bzl", "separator")

separator(name = "separator")
23 changes: 23 additions & 0 deletions modules/download_utils/1.0.0-beta.5/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
bcr_test_module:
module_path: e2e
matrix:
bazel:
- 7.x
- 8.0.0rc4
platform:
- centos7_java11_devtoolset10
- debian10
- debian11
- ubuntu2004
- ubuntu2204
- fedora39
- macos
- macos_arm64
- windows
tasks:
e2e_tests:
name: Run end-to-end Tests
bazel: ${{ bazel }}
platform: ${{ platform }}
test_targets:
- "//..."
5 changes: 5 additions & 0 deletions modules/download_utils/1.0.0-beta.5/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"url": "https://gitlab.arm.com/bazel/download_utils/-/releases/v1.0.0-beta.5/downloads/src.tar.gz",
"integrity": "sha512-lN+XklrjujwU3mb3ykUy+kBZ/Zvaiapi97hlK47aNh2FyQB8c5MTpZiMD8w72IlMLsUyUoBm9HKThq/yS/UXXQ==",
"strip_prefix": "download_utils-v1.0.0-beta.5"
}
3 changes: 2 additions & 1 deletion modules/download_utils/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"versions": [
"1.0.0-beta.1",
"1.0.0-beta.2",
"1.0.0-beta.4"
"1.0.0-beta.4",
"1.0.0-beta.5"
],
"maintainers": [
{
Expand Down
32 changes: 32 additions & 0 deletions modules/rules_bzip2/1.0.0-beta.6/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
module(
name = "rules_bzip2",
version = "1.0.0-beta.6",
bazel_compatibility = [
">=7.1.0",
],
compatibility_level = 1,
)

bazel_dep(name = "rules_coreutils", version = "1.0.0-beta.8")
bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.18")
bazel_dep(name = "ape", version = "1.0.0-beta.15")
bazel_dep(name = "bzip2", version = "1.0.8.bcr.1", repo_name = "bcr")

bazel_dep(name = "hermetic_cc_toolchain", version = "3.1.0", dev_dependency = True)

export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain_export")
use_repo(export, "ape-bzip2")
export.symlink(
name = "bzip2",
target = "@ape-bzip2",
)
use_repo(export, "bzip2")

resolved = use_repo_rule("@toolchain_utils//toolchain/resolved:defs.bzl", "toolchain_resolved")

resolved(
name = "resolved-bzip2",
toolchain_type = "//bzip2/toolchain/bzip2:type",
)

register_toolchains("//bzip2/toolchain/...")
23 changes: 23 additions & 0 deletions modules/rules_bzip2/1.0.0-beta.6/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
bcr_test_module:
module_path: e2e
matrix:
bazel:
- 7.x
- 8.0.0rc4
platform:
- centos7_java11_devtoolset10
- debian10
- debian11
- ubuntu2004
- ubuntu2204
- fedora39
- macos
- macos_arm64
- windows
tasks:
e2e_tests:
name: Run end-to-end Tests
bazel: ${{ bazel }}
platform: ${{ platform }}
test_targets:
- "//..."
5 changes: 5 additions & 0 deletions modules/rules_bzip2/1.0.0-beta.6/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"url": "https://gitlab.arm.com/bazel/rules_bzip2/-/releases/v1.0.0-beta.6/downloads/src.tar.gz",
"integrity": "sha512-Vw0goD/sXqFIDZmBLjVFVJYdOHfD5ljQwnkKM6/s/BNDKK23H8DK7CG2D6OWrVUUsWMiLl7ggPCeKgJbME9CPg==",
"strip_prefix": "rules_bzip2-v1.0.0-beta.6"
}
3 changes: 2 additions & 1 deletion modules/rules_bzip2/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"1.0.0-beta.1",
"1.0.0-beta.2",
"1.0.0-beta.3",
"1.0.0-beta.5"
"1.0.0-beta.5",
"1.0.0-beta.6"
],
"maintainers": [
{
Expand Down
30 changes: 30 additions & 0 deletions modules/rules_curl/1.0.0-alpha.13/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
module(
name = "rules_curl",
version = "1.0.0-alpha.13",
bazel_compatibility = [
">=7.4.0",
],
compatibility_level = 1,
)

bazel_dep(name = "bazel_skylib", version = "1.5.0")
bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.18")
bazel_dep(name = "ape", version = "1.0.0-beta.16")
bazel_dep(name = "rules_go", version = "0.48.1")

export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain_export")
use_repo(export, "ape-curl")
export.symlink(
name = "curl",
target = "@ape-curl",
)
use_repo(export, "curl")

resolved = use_repo_rule("@toolchain_utils//toolchain/resolved:defs.bzl", "toolchain_resolved")

resolved(
name = "resolved-curl",
toolchain_type = "//curl/toolchain/curl:type",
)

register_toolchains("//curl/toolchain/...")
20 changes: 20 additions & 0 deletions modules/rules_curl/1.0.0-alpha.13/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
bcr_test_module:
module_path: e2e
matrix:
bazel:
- 7.x
- 8.0.0rc4
platform:
- centos7_java11_devtoolset10
- debian10
- debian11
- ubuntu2004
- ubuntu2204
- fedora39
tasks:
e2e_tests:
name: Run end-to-end Tests
bazel: ${{ bazel }}
platform: ${{ platform }}
test_targets:
- "//..."
5 changes: 5 additions & 0 deletions modules/rules_curl/1.0.0-alpha.13/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"url": "https://gitlab.arm.com/bazel/rules_curl/-/releases/v1.0.0-alpha.13/downloads/src.tar.gz",
"integrity": "sha512-HdGOD7/+FlQD22Mw/jh6XV6/0i1VZZX0G7puDLWukVApBk8UVToWIbojY/7nwz+dgJ6Jmd/SIpgMo3jy84tYDA==",
"strip_prefix": "rules_curl-v1.0.0-alpha.13"
}
3 changes: 2 additions & 1 deletion modules/rules_curl/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"versions": [
"1.0.0-alpha.6",
"1.0.0-alpha.7",
"1.0.0-alpha.8"
"1.0.0-alpha.8",
"1.0.0-alpha.13"
],
"maintainers": [
{
Expand Down
33 changes: 33 additions & 0 deletions modules/rules_diff/1.0.0-beta.6/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
module(
name = "rules_diff",
version = "1.0.0-beta.6",
bazel_compatibility = [
">=7.1.0",
],
compatibility_level = 1,
)

bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.18")
bazel_dep(name = "ape", version = "1.0.0-beta.15")

export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain_export")

resolved = use_repo_rule("@toolchain_utils//toolchain/resolved:defs.bzl", "toolchain_resolved")

[
(
use_repo(export, "ape-{}".format(tool)),
export.symlink(
name = tool,
target = "@ape-{}".format(tool),
),
use_repo(export, tool),
resolved(
name = "resolved-{}".format(tool),
toolchain_type = "//diff/toolchain/{}:type".format(tool),
),
)
for tool in ("diff", "diff3", "sdiff", "cmp")
]

register_toolchains("//diff/toolchain/...")
23 changes: 23 additions & 0 deletions modules/rules_diff/1.0.0-beta.6/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
bcr_test_module:
module_path: e2e
matrix:
bazel:
- 7.x
- 8.0.0rc4
platform:
- centos7_java11_devtoolset10
- debian10
- debian11
- ubuntu2004
- ubuntu2204
- fedora39
- macos
- macos_arm64
- windows
tasks:
e2e_tests:
name: Run end-to-end Tests
bazel: ${{ bazel }}
platform: ${{ platform }}
test_targets:
- "//..."
5 changes: 5 additions & 0 deletions modules/rules_diff/1.0.0-beta.6/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"url": "https://gitlab.arm.com/bazel/rules_diff/-/releases/v1.0.0-beta.6/downloads/src.tar.gz",
"integrity": "sha512-+nDsi0dD+ajcVs2HMlT+idhKwSZ/hzA25O7mD+mLV5+8RrXVU41b6ooPlpxqNJ0qv4WEqSkgENdNsGaPkAOMxA==",
"strip_prefix": "rules_diff-v1.0.0-beta.6"
}
3 changes: 2 additions & 1 deletion modules/rules_diff/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"1.0.0-beta.2",
"1.0.0-beta.3",
"1.0.0-beta.4",
"1.0.0-beta.5"
"1.0.0-beta.5",
"1.0.0-beta.6"
],
"maintainers": [
{
Expand Down
29 changes: 29 additions & 0 deletions modules/rules_gzip/1.0.0-beta.6/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
module(
name = "rules_gzip",
version = "1.0.0-beta.6",
bazel_compatibility = [
">=7.1.0",
],
compatibility_level = 1,
)

bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.18")
bazel_dep(name = "rules_coreutils", version = "1.0.0-beta.8")
bazel_dep(name = "ape", version = "1.0.0-beta.15")

export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain_export")
use_repo(export, "ape-gzip")
export.symlink(
name = "gzip",
target = "@ape-gzip",
)
use_repo(export, "gzip")

resolved = use_repo_rule("@toolchain_utils//toolchain/resolved:defs.bzl", "toolchain_resolved")

resolved(
name = "resolved-gzip",
toolchain_type = "//gzip/toolchain/gzip:type",
)

register_toolchains("//gzip/toolchain/...")
23 changes: 23 additions & 0 deletions modules/rules_gzip/1.0.0-beta.6/presubmit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
bcr_test_module:
module_path: e2e
matrix:
bazel:
- 7.x
- 8.0.0rc4
platform:
- centos7_java11_devtoolset10
- debian10
- debian11
- ubuntu2004
- ubuntu2204
- fedora39
- macos
- macos_arm64
- windows
tasks:
e2e_tests:
name: Run end-to-end Tests
bazel: ${{ bazel }}
platform: ${{ platform }}
test_targets:
- "//..."
5 changes: 5 additions & 0 deletions modules/rules_gzip/1.0.0-beta.6/source.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"url": "https://gitlab.arm.com/bazel/rules_gzip/-/releases/v1.0.0-beta.6/downloads/src.tar.gz",
"integrity": "sha512-cRtROtrfSjATLWkJBqKAoR6+OUnxJNUacNAy1znMNn0gP6b4oTrwVl1HuNXO+Jl91IQb6KTztZseazRg4huyZg==",
"strip_prefix": "rules_gzip-v1.0.0-beta.6"
}
3 changes: 2 additions & 1 deletion modules/rules_gzip/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"1.0.0-beta.1",
"1.0.0-beta.2",
"1.0.0-beta.3",
"1.0.0-beta.5"
"1.0.0-beta.5",
"1.0.0-beta.6"
],
"maintainers": [
{
Expand Down
Loading

0 comments on commit db1f139

Please sign in to comment.