Skip to content

Commit d5cf947

Browse files
malt3malt3
authored
switch to rules_img and add image amd64/v3 variant (#304)
1 parent 9d57c37 commit d5cf947

File tree

7 files changed

+183
-299
lines changed

7 files changed

+183
-299
lines changed

‎.github/workflows/main.yaml‎

Lines changed: 101 additions & 40 deletions
Large diffs are not rendered by default.

‎.github/workflows/pull-requests.yaml‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,42 +21,47 @@
2121
{
2222
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'linux_amd64'",
2323
"name": "linux_amd64: build${{ matrix.host.platform_name == 'linux_amd64' && ' and test' || '' }}",
24-
"run": "bazel ${{ matrix.host.platform_name == 'linux_amd64' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:linux_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
24+
"run": "bazel ${{ matrix.host.platform_name == 'linux_amd64' && 'test --test_output=errors' || 'build --platforms=//tools/platforms:linux_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
25+
},
26+
{
27+
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'linux_amd64_v3'",
28+
"name": "linux_amd64_v3: build${{ matrix.host.platform_name == 'linux_amd64_v3' && ' and test' || '' }}",
29+
"run": "bazel ${{ matrix.host.platform_name == 'linux_amd64_v3' && 'test --test_output=errors' || 'build --platforms=//tools/platforms:linux_amd64_v3 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
2530
},
2631
{
2732
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'linux_386'",
2833
"name": "linux_386: build${{ matrix.host.platform_name == 'linux_amd64' && ' and test' || '' }}",
29-
"run": "bazel ${{ matrix.host.platform_name == 'linux_amd64' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:linux_386 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
34+
"run": "bazel ${{ matrix.host.platform_name == 'linux_amd64' && 'test --test_output=errors' || 'build --platforms=//tools/platforms:linux_386 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
3035
},
3136
{
3237
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'linux_arm'",
3338
"name": "linux_arm: build${{ matrix.host.platform_name == 'linux_arm' && ' and test' || '' }}",
34-
"run": "bazel ${{ matrix.host.platform_name == 'linux_arm' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:linux_arm --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
39+
"run": "bazel ${{ matrix.host.platform_name == 'linux_arm' && 'test --test_output=errors' || 'build --platforms=//tools/platforms:linux_arm --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
3540
},
3641
{
3742
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'linux_arm64'",
3843
"name": "linux_arm64: build${{ matrix.host.platform_name == 'linux_arm64' && ' and test' || '' }}",
39-
"run": "bazel ${{ matrix.host.platform_name == 'linux_arm64' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:linux_arm64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
44+
"run": "bazel ${{ matrix.host.platform_name == 'linux_arm64' && 'test --test_output=errors' || 'build --platforms=//tools/platforms:linux_arm64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
4045
},
4146
{
4247
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'darwin_amd64'",
4348
"name": "darwin_amd64: build${{ matrix.host.platform_name == 'darwin_amd64' && ' and test' || '' }}",
44-
"run": "bazel ${{ matrix.host.platform_name == 'darwin_amd64' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:darwin_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
49+
"run": "bazel ${{ matrix.host.platform_name == 'darwin_amd64' && 'test --test_output=errors' || 'build --platforms=//tools/platforms:darwin_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
4550
},
4651
{
4752
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'darwin_arm64'",
4853
"name": "darwin_arm64: build${{ matrix.host.platform_name == 'darwin_arm64' && ' and test' || '' }}",
49-
"run": "bazel ${{ matrix.host.platform_name == 'darwin_arm64' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:darwin_arm64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
54+
"run": "bazel ${{ matrix.host.platform_name == 'darwin_arm64' && 'test --test_output=errors' || 'build --platforms=//tools/platforms:darwin_arm64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
5055
},
5156
{
5257
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'freebsd_amd64'",
5358
"name": "freebsd_amd64: build${{ matrix.host.platform_name == 'freebsd_amd64' && ' and test' || '' }}",
54-
"run": "bazel ${{ matrix.host.platform_name == 'freebsd_amd64' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:freebsd_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
59+
"run": "bazel ${{ matrix.host.platform_name == 'freebsd_amd64' && 'test --test_output=errors' || 'build --platforms=//tools/platforms:freebsd_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
5560
},
5661
{
5762
"if": "matrix.host.cross_compile || matrix.host.platform_name == 'windows_amd64'",
5863
"name": "windows_amd64: build${{ matrix.host.platform_name == 'windows_amd64' && ' and test' || '' }}",
59-
"run": "bazel ${{ matrix.host.platform_name == 'windows_amd64' && 'test --test_output=errors' || 'build --platforms=@rules_go//go/toolchain:windows_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
64+
"run": "bazel ${{ matrix.host.platform_name == 'windows_amd64' && 'test --test_output=errors' || 'build --platforms=//tools/platforms:windows_amd64 --@bazel_tools//tools/test:incompatible_use_default_test_toolchain=False' }} //..."
6065
}
6166
],
6267
"strategy": {

‎MODULE.bazel‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ bazel_dep(name = "platforms", version = "1.0.0")
1313
bazel_dep(name = "protobuf", version = "33.0")
1414
bazel_dep(name = "rules_foreign_cc", version = "0.15.1")
1515
bazel_dep(name = "rules_go", version = "0.58.3")
16+
bazel_dep(name = "rules_img", version = "0.2.9")
1617
bazel_dep(name = "rules_jsonnet", version = "0.7.2")
1718
bazel_dep(name = "rules_nodejs", version = "6.6.0")
18-
bazel_dep(name = "rules_oci", version = "2.2.6")
19-
bazel_dep(name = "rules_pkg", version = "1.1.0")
2019
bazel_dep(name = "rules_proto", version = "7.1.0")
2120
bazel_dep(name = "rules_shell", version = "0.6.1")
2221
bazel_dep(name = "toolchains_llvm", version = "1.5.0")
@@ -154,19 +153,11 @@ npm.npm_translate_lock(
154153
)
155154
use_repo(npm, "com_github_buildbarn_bb_storage_npm")
156155

157-
oci = use_extension("@rules_oci//oci:extensions.bzl", "oci")
158-
oci.pull(
156+
pull = use_repo_rule("@rules_img//img:pull.bzl", "pull")
157+
158+
pull(
159159
name = "distroless_static",
160160
digest = "sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac",
161-
image = "gcr.io/distroless/static",
162-
platforms = [
163-
"linux/amd64",
164-
"linux/arm64/v8",
165-
],
166-
)
167-
use_repo(
168-
oci,
169-
"distroless_static",
170-
"distroless_static_linux_amd64",
171-
"distroless_static_linux_arm64_v8",
161+
registry = "gcr.io",
162+
repository = "distroless/static",
172163
)

‎MODULE.bazel.lock‎

Lines changed: 3 additions & 209 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)