Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update apko to v0.14.9 and refresh lockfiles #77

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
7.1.0
7.1.2
# The first line of this file is used by Bazelisk and Bazel to be sure
# the right version of Bazel is used to build and test this repo.
# This also defines which version is used on CI.
Expand Down
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependenc
bazel_dep(name = "buildifier_prebuilt", version = "6.1.2", dev_dependency = True)

toolchain = use_extension("//apko:extensions.bzl", "apko")
toolchain.toolchain(apko_version = "v0.14.2")
toolchain.toolchain(apko_version = "v0.14.9")
use_repo(toolchain, "apko_toolchains")

register_toolchains("@apko_toolchains//:all")
Expand Down
7 changes: 7 additions & 0 deletions apko/private/versions.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
# Add new versions by running
# ./scripts/mirror_apko.sh
APKO_VERSIONS = {
"v0.14.9": {
"darwin_amd64": "sha256-zfhk+ohhtqcg93xUx10/v41+8SCwiDy6rMQKFt4hYbc=",
"darwin_arm64": "sha256-AUQxWhBg/cOSxlN8UjuQ4OtRjTIhwcrIsrOa0sALh9s=",
"linux_386": "sha256-ZmuAcsYHi5F3LY8IugMlqL3wmisW96IPlXZKAY1M6Zk=",
"linux_amd64": "sha256-oQxnDuOlyn1U9tssLSBDxpdGuY3wCHiJ1JguLrQbPJk=",
"linux_arm64": "sha256-nDVTBYcIBYufrO4I1pVJwy7nZ36xxLEvFywP4vs4MRM=",
},
"v0.14.2": {
"darwin_amd64": "sha256-L+6t2IbGWHQCs8WQWHEwit3K2QumkDJmjCJmkJErkLI=",
"darwin_arm64": "sha256-EkqZ6sUI1uOasI1lL5C21+rngE/5/RABJblGWdicp0E=",
Expand Down
2 changes: 1 addition & 1 deletion apko/tests/versions_test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ load("//apko/private:versions.bzl", "APKO_VERSIONS")

def _smoke_test_impl(ctx):
env = unittest.begin(ctx)
asserts.equals(env, "v0.14.2", APKO_VERSIONS.keys()[0])
asserts.equals(env, "v0.14.9", APKO_VERSIONS.keys()[0])
return unittest.end(env)

# The unittest library requires that we export the test cases as named test rules,
Expand Down
18 changes: 9 additions & 9 deletions e2e/smoke/apko.lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 14 additions & 10 deletions e2e/smoke/multifile_config/apko.generated.lock.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"version": "v1",
"config": {
"name": "multifile_config/final_config",
"checksum": "sha256-MSnniHz70jvjVUCXoODhAlzNWxY5Vdjb8UOK8gFF0bk="
},
"contents": {
"keyring": [],
"repositories": [
Expand Down Expand Up @@ -31,23 +35,23 @@
},
{
"name": "busybox",
"url": "https://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/busybox-1.36.1-r5.apk",
"version": "1.36.1-r5",
"url": "https://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/busybox-1.36.1-r7.apk",
"version": "1.36.1-r7",
"architecture": "x86_64",
"signature": {
"range": "bytes=0-665",
"checksum": "sha1-oXF25kDE6Jja1iQ2psyt9nV+ddE="
"range": "bytes=0-666",
"checksum": "sha1-a//l3+A49R6SnnktH1+pQuZE2qI="
},
"control": {
"range": "bytes=666-2301",
"checksum": "sha1-aBWv1Kn2ASOLShUeDPoSLaozuMs="
"range": "bytes=667-2300",
"checksum": "sha1-ierGKl33AY17yZdo8YN+z8NeMPg="
},
"data": {
"range": "bytes=2302-946176",
"checksum": "sha256-pDdzepugl8LYISmpJ2wGr885gfpwo2hi9ZMf4dQTi5s="
"range": "bytes=2301-946176",
"checksum": "sha256-FzlpW4Mq56716OmdQnwYlES9hohBM0ouq62EWds3kDI="
},
"checksum": "Q1aBWv1Kn2ASOLShUeDPoSLaozuMs="
"checksum": "Q1ierGKl33AY17yZdo8YN+z8NeMPg="
}
]
}
}
}
18 changes: 9 additions & 9 deletions examples/lock/apko.lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

104 changes: 52 additions & 52 deletions examples/multi_arch_and_repo/apko.lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/multi_arch_and_repo/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ commandTests:
- ID=custom_alpine
- NAME="Custom Alpine"
- VERSION_ID=0.0.0
- HOME_URL="https://github.com/chainguard-dev/apko"
- HOME_URL="https://chainguard.dev/apko"
Loading
Loading