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

add apko 0.19.2 #98

Merged
merged 11 commits into from
Sep 26, 2024
Merged
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
3 changes: 2 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ jobs:
with:
repository-cache: true
bazelrc: |
common --announce_rc --color=yes --enable_bzlmod=${{ matrix.bzlmodEnabled }}
common --announce_rc --color=yes --enable_bzlmod=${{ matrix.bzlmodEnabled }}
test --test_output=errors
${{ (matrix.bazelversion == '6.4.0' && 'try-import %workspace%/.apko/.bazelrc') || '' }}

- name: Configure Bazel version
Expand Down
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ bazel_dep(name = "buildifier_prebuilt", version = "6.1.2", dev_dependency = True
bazel_dep(name = "stardoc", version = "0.7.0", dev_dependency = True, repo_name = "io_bazel_stardoc")

toolchain = use_extension("//apko:extensions.bzl", "apko")
toolchain.toolchain(apko_version = "v0.14.2")
toolchain.toolchain(apko_version = "v0.19.2")
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.19.2": {
"darwin_amd64": "sha256-2CNAV7DkXZYp0GzedQNXcIPxeJVQRy30xbOBvDdlhsg=",
"darwin_arm64": "sha256-5hLBKfVaqBMrGzTiHsF/Er4p5AZwB++xKDRgFjD/Pho=",
"linux_386": "sha256-D1EmpWMT+DwRrWkVdI+6vxw54o7aiPfUfDSWPaXllBs=",
"linux_amd64": "sha256-IdXHZC4/CBRCRouCyWYt2ETy8AhIT/JAGLTStEl1t9M=",
"linux_arm64": "sha256-2v2EySFUNJtovpkASfvxEXwteq4rwD3ItJ5LZWP0Tjc=",
},
"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.19.2", APKO_VERSIONS.keys()[0])
return unittest.end(env)

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

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

8 changes: 0 additions & 8 deletions e2e/smoke/apko.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,5 @@ environment:

cmd: /bin/sh -l

# data for /etc/os-release if it does not already exist
# in the image
os-release:
id: alpine
version-id: "3.16.0"
name: "Alpine Slim"
pretty-name: "Alpine Slim (apko)"

archs:
- amd64
7 changes: 4 additions & 3 deletions e2e/smoke/multifile_config/apko.generated.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
"version": "v1",
"config": {
"name": "multifile_config/final_config",
"checksum": "sha256-MSnniHz70jvjVUCXoODhAlzNWxY5Vdjb8UOK8gFF0bk="
"checksum": "sha256-cbLPq0rolyTr2T+etXlonp07UpkdECuX+ficViK7Tng="
},
"contents": {
"keyring": [],
"build_repositories": [],
"repositories": [
{
"name": "dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64",
Expand All @@ -28,7 +29,7 @@
"checksum": "sha1-odtIYtKyOCg6suF/cDaYpygL7hw="
},
"data": {
"range": "bytes=1225-634880",
"range": "bytes=1225-390426",
"checksum": "sha256-KPwSgRdeAcnVvczowX1F54Aszov9ZI1cRXgtFZzepfg="
},
"checksum": "Q1odtIYtKyOCg6suF/cDaYpygL7hw="
Expand All @@ -47,7 +48,7 @@
"checksum": "sha1-ierGKl33AY17yZdo8YN+z8NeMPg="
},
"data": {
"range": "bytes=2301-946176",
"range": "bytes=2301-510094",
"checksum": "sha256-FzlpW4Mq56716OmdQnwYlES9hohBM0ouq62EWds3kDI="
},
"checksum": "Q1ierGKl33AY17yZdo8YN+z8NeMPg="
Expand Down
8 changes: 0 additions & 8 deletions e2e/smoke/multifile_config/base_config.apko.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,5 @@ environment:

cmd: /bin/sh -l

# data for /etc/os-release if it does not already exist
# in the image
os-release:
id: alpine
version-id: "3.16.0"
name: "Alpine Slim"
pretty-name: "Alpine Slim (apko)"

archs:
- amd64
7 changes: 4 additions & 3 deletions examples/lock/apko.lock.json

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

8 changes: 0 additions & 8 deletions examples/lock/apko.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,5 @@ environment:

cmd: /bin/sh -l

# data for /etc/os-release if it does not already exist
# in the image
os-release:
id: alpine
version-id: "3.16.0"
name: "Alpine Slim"
pretty-name: "Alpine Slim (apko)"

archs:
- amd64
Loading
Loading