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.

Sign up for GitHub

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

Make changes to release new golang minimal images and bb #1459

Merged
merged 4 commits into from
Jul 9, 2024
Merged

Make changes to release new golang minimal images and bb #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5223fd
make changes to release new golang minimal images and bb
rcrozean Jul 9, 2024
6e20c59
update golang checksums
rcrozean Jul 9, 2024
2cb1421
update golang expected tests
rcrozean Jul 9, 2024
912f2de
updating expected tests round 2
rcrozean Jul 9, 2024
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
24 changes: 12 additions & 12 deletions EKS_DISTRO_TAG_FILE.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ al2:
eks-distro-minimal-base-golang-compiler-1.20-base: 1.20-2024-07-01-1719792056.2
eks-distro-minimal-base-golang-compiler-1.20-yum: 1.20-yum-2024-07-01-1719792056.2
eks-distro-minimal-base-golang-compiler-1.20-gcc: 1.20-gcc-2024-06-25-1719324725.2
eks-distro-minimal-base-golang-compiler-1.21-base: 1.21-2024-07-01-1719792056.2
eks-distro-minimal-base-golang-compiler-1.21-yum: 1.21-yum-2024-07-01-1719792056.2
eks-distro-minimal-base-golang-compiler-1.21-gcc: 1.21-gcc-2024-06-25-1719324725.2
eks-distro-minimal-base-golang-compiler-1.22-base: 1.22-2024-07-01-1719792056.2
eks-distro-minimal-base-golang-compiler-1.22-yum: 1.22-yum-2024-07-01-1719792056.2
eks-distro-minimal-base-golang-compiler-1.22-gcc: 1.22-gcc-2024-06-25-1719324725.2
eks-distro-minimal-base-golang-compiler-1.21-base: null
eks-distro-minimal-base-golang-compiler-1.21-yum: null
eks-distro-minimal-base-golang-compiler-1.21-gcc: null
eks-distro-minimal-base-golang-compiler-1.22-base: null
eks-distro-minimal-base-golang-compiler-1.22-yum: null
eks-distro-minimal-base-golang-compiler-1.22-gcc: null
eks-distro-minimal-base-nodejs-compiler-16-base: 16-2024-07-01-1719792056.2
eks-distro-minimal-base-nodejs-compiler-16-yum: 16-yum-2024-07-01-1719792056.2
eks-distro-minimal-base-nodejs-compiler-16-gcc: 16-gcc-2024-06-25-1719324725.2
Expand Down Expand Up @@ -76,12 +76,12 @@ al2023:
eks-distro-minimal-base-golang-compiler-1.20-base: 1.20-2024-07-02-1719903665.2023
eks-distro-minimal-base-golang-compiler-1.20-yum: 1.20-yum-2024-07-02-1719903665.2023
eks-distro-minimal-base-golang-compiler-1.20-gcc: 1.20-gcc-2024-07-02-1719903665.2023
eks-distro-minimal-base-golang-compiler-1.21-base: 1.21-2024-07-02-1719903665.2023
eks-distro-minimal-base-golang-compiler-1.21-yum: 1.21-yum-2024-07-02-1719903665.2023
eks-distro-minimal-base-golang-compiler-1.21-gcc: 1.21-gcc-2024-07-02-1719903665.2023
eks-distro-minimal-base-golang-compiler-1.22-base: 1.22-2024-07-02-1719903665.2023
eks-distro-minimal-base-golang-compiler-1.22-yum: 1.22-yum-2024-07-02-1719903665.2023
eks-distro-minimal-base-golang-compiler-1.22-gcc: 1.22-gcc-2024-07-02-1719903665.2023
eks-distro-minimal-base-golang-compiler-1.21-base: null
eks-distro-minimal-base-golang-compiler-1.21-yum: null
eks-distro-minimal-base-golang-compiler-1.21-gcc: null
eks-distro-minimal-base-golang-compiler-1.22-base: null
eks-distro-minimal-base-golang-compiler-1.22-yum: null
eks-distro-minimal-base-golang-compiler-1.22-gcc: null
eks-distro-minimal-base-nodejs-compiler-16-base: 16-2024-07-01-1719792056.2023
eks-distro-minimal-base-nodejs-compiler-16-yum: 16-yum-2024-07-01-1719792056.2023
eks-distro-minimal-base-nodejs-compiler-16-gcc: 16-gcc-2024-07-01-1719792056.2023
Expand Down
2 changes: 1 addition & 1 deletion builder-base/checksums/go-go1.21-amd64-checksum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
54a87a9325155b98c85bc04dc50298ddd682489eb47f486f2e6cb0707554abf0 /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/amd64/go1.21.11.linux-amd64.tar.gz
121ab58632787e18ae0caa8ae285b581f9470d0f6b3defde9e1600e211f583c5 /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/amd64/go1.21.12.linux-amd64.tar.gz
2 changes: 1 addition & 1 deletion builder-base/checksums/go-go1.21-arm64-checksum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
715d9a7ff72e4e0e3378c48318c52c6e4dd32a47c4136f3c08846f89b2ee2241 /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/arm64/go1.21.11.linux-arm64.tar.gz
94cb3ec4a1e08a00da55c33e63f725be91f10ba743907b5615ef34e54675ba2e /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/arm64/go1.21.12.linux-arm64.tar.gz
2 changes: 1 addition & 1 deletion builder-base/checksums/go-go1.22-amd64-checksum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ba79d4526102575196273416239cca418a651e049c2b099f3159db85e7bade7d /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/amd64/go1.22.4.linux-amd64.tar.gz
904b924d435eaea086515bc63235b192ea441bd8c9b198c507e85009e6e4c7f0 /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/amd64/go1.22.5.linux-amd64.tar.gz
2 changes: 1 addition & 1 deletion builder-base/checksums/go-go1.22-arm64-checksum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a8e177c354d2e4a1b61020aca3562e27ea3e8f8247eca3170e3fa1e0c2f9e771 /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/arm64/go1.22.4.linux-arm64.tar.gz
8d21325bfcf431be3660527c1a39d3d9ad71535fabdf5041c826e44e31642b5a /home/prow/go/src/github.com/aws/eks-distro-build-tooling/builder-base/tmp/golang-downloads/linux/arm64/go1.22.5.linux-arm64.tar.gz
4 changes: 2 additions & 2 deletions builder-base/versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ GOLANG_VERSION_117: 1.17.13-6
GOLANG_VERSION_118: 1.18.10-8
GOLANG_VERSION_119: 1.19.13-14
GOLANG_VERSION_120: 1.20.14-16
GOLANG_VERSION_121: 1.21.11-12
GOLANG_VERSION_122: 1.22.4-4
GOLANG_VERSION_121: 1.21.12-0
GOLANG_VERSION_122: 1.22.5-0
GO_LICENSES_VERSION: v1.6.0
GOVC_VERSION: 0.34.2
GO_VULN_CHECK_VERSION: v1.0.1
Expand Down
4 changes: 2 additions & 2 deletions eks-distro-base/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,8 @@ BASE_GOLANG_VARIANT_VERSIONS=1.18 1.19 1.20 1.21 1.22
GOLANG_1.18_FULL_VERSION=1.18.10-8
GOLANG_1.19_FULL_VERSION=1.19.13-14
GOLANG_1.20_FULL_VERSION=1.20.14-16
GOLANG_1.21_FULL_VERSION=1.21.11-12
GOLANG_1.22_FULL_VERSION=1.22.4-4
GOLANG_1.21_FULL_VERSION=1.21.12-0
GOLANG_1.22_FULL_VERSION=1.22.5-0

BASE_GOLANG_COMPILER_VARIANT_VERSIONS=$(foreach ver,$(BASE_GOLANG_VARIANT_VERSIONS),$(addprefix $(ver)-,$(BASE_COMPILER_VARIANT_VERSIONS)))
# ************************************************************
Expand Down
4 changes: 2 additions & 2 deletions eks-distro-base/make-tests/expected/base-golang-compiler-1.22-base/images/deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ checking pushed file: /override/root/eks-distro-minimal-base-compiler-base-pushe
checking pushed file: /override/root/eks-distro-minimal-base-golang-compiler-1.22-base-pushed - false
tag from file for eks-distro-minimal-base-golang-compiler-1.22-base: some-previous-tag
printf "\n\nBuilding base-golang-compiler-1.22-base builder stage\n\n"
/override/root/../scripts/buildkit.sh build --frontend dockerfile.v0 --opt filename=Dockerfile.minimal-base-golang --opt platform=linux/amd64 --opt build-arg:OUTPUT_DEBUG_LOG= --opt build-arg:BASE_IMAGE=localhost:5000/compiler-base:test-tag --opt build-arg:BUILDER_IMAGE=localhost:5000/compiler-base-builder:test-tag --opt build-arg:VERSIONED_VARIANT=1.22 --opt build-arg:AL_TAG=2 --opt build-arg:COMPILER_VERSION=1.22 --opt build-arg:COMPILER_FULL_VERSION=1.22.4-4 --opt build-arg:IS_COMPILER=true --opt build-arg:MINIMAL_BASE_BUILDER_IMAGE=localhost:5000/eks-distro-minimal-base-builder:test-tag --progress plain --local dockerfile=./ --local context=. --opt target=builder --export-cache type=inline --import-cache type=registry,ref=public.ecr.aws/eks-distro-build-tooling/golang-builder:some-previous-tag --opt no-cache=builder-golang-base --output type=image,oci-mediatypes=true,\"name=localhost:5000/golang-builder:1.22-test-tag,localhost:5000/golang-builder:1.22,localhost:5000/golang-builder:1.22.4-4,localhost:5000/golang-builder:1.22.4,localhost:5000/golang-builder:1.22.4,localhost:5000/golang-builder:1.22-al2,localhost:5000/golang-builder:1.22.4-4-al2,localhost:5000/golang-builder:1.22.4-al2,localhost:5000/golang-builder:1.22.4-al2\",push=true
/override/root/../scripts/buildkit.sh build --frontend dockerfile.v0 --opt filename=Dockerfile.minimal-base-golang --opt platform=linux/amd64 --opt build-arg:OUTPUT_DEBUG_LOG= --opt build-arg:BASE_IMAGE=localhost:5000/compiler-base:test-tag --opt build-arg:BUILDER_IMAGE=localhost:5000/compiler-base-builder:test-tag --opt build-arg:VERSIONED_VARIANT=1.22 --opt build-arg:AL_TAG=2 --opt build-arg:COMPILER_VERSION=1.22 --opt build-arg:COMPILER_FULL_VERSION=1.22.5-0 --opt build-arg:IS_COMPILER=true --opt build-arg:MINIMAL_BASE_BUILDER_IMAGE=localhost:5000/eks-distro-minimal-base-builder:test-tag --progress plain --local dockerfile=./ --local context=. --opt target=builder --export-cache type=inline --import-cache type=registry,ref=public.ecr.aws/eks-distro-build-tooling/golang-builder:some-previous-tag --opt no-cache=builder-golang-base --output type=image,oci-mediatypes=true,\"name=localhost:5000/golang-builder:1.22-test-tag,localhost:5000/golang-builder:1.22,localhost:5000/golang-builder:1.22.5-0,localhost:5000/golang-builder:1.22.5,localhost:5000/golang-builder:1.22.5,localhost:5000/golang-builder:1.22-al2,localhost:5000/golang-builder:1.22.5-0-al2,localhost:5000/golang-builder:1.22.5-al2,localhost:5000/golang-builder:1.22.5-al2\",push=true
printf "\n\nBuilding base-golang-compiler-1.22-base final stage\n\n"
./check_update.sh golang 2 eks-distro-minimal-base-golang-compiler-1.22-base --security
/override/root/../scripts/buildkit.sh build --frontend dockerfile.v0 --opt filename=Dockerfile.minimal-base-golang --opt platform=linux/amd64 --opt build-arg:OUTPUT_DEBUG_LOG= --opt build-arg:BASE_IMAGE=localhost:5000/compiler-base:test-tag --opt build-arg:BUILT_BUILDER_IMAGE=localhost:5000/golang-builder:1.22-test-tag --opt build-arg:VERSIONED_VARIANT=1.22 --opt build-arg:AL_TAG=2 --opt build-arg:COMPILER_VERSION=1.22 --opt build-arg:COMPILER_FULL_VERSION=1.22.4-4 --opt build-arg:IS_COMPILER=true --progress plain --local dockerfile=./ --local context=. --opt target=final --export-cache type=inline --import-cache type=registry,ref=public.ecr.aws/eks-distro-build-tooling/golang-builder:some-previous-tag --opt no-cache=builder-golang-base --output type=image,oci-mediatypes=true,\"name=localhost:5000/golang:1.22-test-tag,localhost:5000/golang:1.22,localhost:5000/golang:1.22.4-4,localhost:5000/golang:1.22.4,localhost:5000/golang:1.22.4,localhost:5000/golang:1.22-al2,localhost:5000/golang:1.22.4-4-al2,localhost:5000/golang:1.22.4-al2,localhost:5000/golang:1.22.4-al2\",push=true
/override/root/../scripts/buildkit.sh build --frontend dockerfile.v0 --opt filename=Dockerfile.minimal-base-golang --opt platform=linux/amd64 --opt build-arg:OUTPUT_DEBUG_LOG= --opt build-arg:BASE_IMAGE=localhost:5000/compiler-base:test-tag --opt build-arg:BUILT_BUILDER_IMAGE=localhost:5000/golang-builder:1.22-test-tag --opt build-arg:VERSIONED_VARIANT=1.22 --opt build-arg:AL_TAG=2 --opt build-arg:COMPILER_VERSION=1.22 --opt build-arg:COMPILER_FULL_VERSION=1.22.5-0 --opt build-arg:IS_COMPILER=true --progress plain --local dockerfile=./ --local context=. --opt target=final --export-cache type=inline --import-cache type=registry,ref=public.ecr.aws/eks-distro-build-tooling/golang-builder:some-previous-tag --opt no-cache=builder-golang-base --output type=image,oci-mediatypes=true,\"name=localhost:5000/golang:1.22-test-tag,localhost:5000/golang:1.22,localhost:5000/golang:1.22.5-0,localhost:5000/golang:1.22.5,localhost:5000/golang:1.22.5,localhost:5000/golang:1.22-al2,localhost:5000/golang:1.22.5-0-al2,localhost:5000/golang:1.22.5-al2,localhost:5000/golang:1.22.5-al2\",push=true
printf "\n\nExporting packages and files from base-golang-compiler-1.22-base final image\n\n"
/override/root/../scripts/buildkit.sh build --frontend dockerfile.v0 --opt filename=Dockerfile.minimal-helpers --opt platform=linux/amd64 --opt build-arg:OUTPUT_DEBUG_LOG= --opt build-arg:BUILT_BUILDER_IMAGE=localhost:5000/golang-builder:1.22-test-tag --opt build-arg:EXPORT_NAME=golang-compiler-1.22-base --progress plain --local dockerfile=./ --local context=. --opt target=export --output type=local,dest=/override/root/../eks-distro-base-minimal-packages/2
if [ -f /override/root/../eks-distro-base-minimal-packages/2/golang-compiler-1.22-base ]; then \
Expand Down
4 changes: 2 additions & 2 deletions eks-distro-base/make-tests/expected/base-golang-compiler-1.22-base/images/no-deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ tag from file for eks-distro-minimal-base: some-previous-tag
checking pushed file: /override/root/eks-distro-minimal-base-golang-compiler-1.22-base-pushed - false
tag from file for eks-distro-minimal-base-golang-compiler-1.22-base: some-previous-tag
printf "\n\nBuilding base-golang-compiler-1.22-base builder stage\n\n"
/override/root/../scripts/buildkit.sh build --frontend dockerfile.v0 --opt filename=Dockerfile.minimal-base-golang --opt platform=linux/amd64 --opt build-arg:OUTPUT_DEBUG_LOG= --opt build-arg:BASE_IMAGE=public.ecr.aws/eks-distro-build-tooling/compiler-base:some-previous-tag --opt build-arg:BUILDER_IMAGE=public.ecr.aws/eks-distro-build-tooling/compiler-base-builder:some-previous-tag --opt build-arg:VERSIONED_VARIANT=1.22 --opt build-arg:AL_TAG=2 --opt build-arg:COMPILER_VERSION=1.22 --opt build-arg:COMPILER_FULL_VERSION=1.22.4-4 --opt build-arg:IS_COMPILER=true --opt build-arg:MINIMAL_BASE_BUILDER_IMAGE=public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-builder:some-previous-tag --progress plain --local dockerfile=./ --local context=. --opt target=builder --export-cache type=inline --import-cache type=registry,ref=public.ecr.aws/eks-distro-build-tooling/golang-builder:some-previous-tag --opt no-cache=builder-golang-base --output type=image,oci-mediatypes=true,\"name=localhost:5000/golang-builder:1.22-test-tag,localhost:5000/golang-builder:1.22,localhost:5000/golang-builder:1.22.4-4,localhost:5000/golang-builder:1.22.4,localhost:5000/golang-builder:1.22.4,localhost:5000/golang-builder:1.22-al2,localhost:5000/golang-builder:1.22.4-4-al2,localhost:5000/golang-builder:1.22.4-al2,localhost:5000/golang-builder:1.22.4-al2\",push=true
/override/root/../scripts/buildkit.sh build --frontend dockerfile.v0 --opt filename=Dockerfile.minimal-base-golang --opt platform=linux/amd64 --opt build-arg:OUTPUT_DEBUG_LOG= --opt build-arg:BASE_IMAGE=public.ecr.aws/eks-distro-build-tooling/compiler-base:some-previous-tag --opt build-arg:BUILDER_IMAGE=public.ecr.aws/eks-distro-build-tooling/compiler-base-builder:some-previous-tag --opt build-arg:VERSIONED_VARIANT=1.22 --opt build-arg:AL_TAG=2 --opt build-arg:COMPILER_VERSION=1.22 --opt build-arg:COMPILER_FULL_VERSION=1.22.5-0 --opt build-arg:IS_COMPILER=true --opt build-arg:MINIMAL_BASE_BUILDER_IMAGE=public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-builder:some-previous-tag --progress plain --local dockerfile=./ --local context=. --opt target=builder --export-cache type=inline --import-cache type=registry,ref=public.ecr.aws/eks-distro-build-tooling/golang-builder:some-previous-tag --opt no-cache=builder-golang-base --output type=image,oci-mediatypes=true,\"name=localhost:5000/golang-builder:1.22-test-tag,localhost:5000/golang-builder:1.22,localhost:5000/golang-builder:1.22.5-0,localhost:5000/golang-builder:1.22.5,localhost:5000/golang-builder:1.22.5,localhost:5000/golang-builder:1.22-al2,localhost:5000/golang-builder:1.22.5-0-al2,localhost:5000/golang-builder:1.22.5-al2,localhost:5000/golang-builder:1.22.5-al2\",push=true
printf "\n\nBuilding base-golang-compiler-1.22-base final stage\n\n"
./check_update.sh golang 2 eks-distro-minimal-base-golang-compiler-1.22-base --security
/override/root/../scripts/buildkit.sh build --frontend dockerfile.v0 --opt filename=Dockerfile.minimal-base-golang --opt platform=linux/amd64 --opt build-arg:OUTPUT_DEBUG_LOG= --opt build-arg:BASE_IMAGE=public.ecr.aws/eks-distro-build-tooling/compiler-base:some-previous-tag --opt build-arg:BUILT_BUILDER_IMAGE=localhost:5000/golang-builder:1.22-test-tag --opt build-arg:VERSIONED_VARIANT=1.22 --opt build-arg:AL_TAG=2 --opt build-arg:COMPILER_VERSION=1.22 --opt build-arg:COMPILER_FULL_VERSION=1.22.4-4 --opt build-arg:IS_COMPILER=true --progress plain --local dockerfile=./ --local context=. --opt target=final --export-cache type=inline --import-cache type=registry,ref=public.ecr.aws/eks-distro-build-tooling/golang-builder:some-previous-tag --opt no-cache=builder-golang-base --output type=image,oci-mediatypes=true,\"name=localhost:5000/golang:1.22-test-tag,localhost:5000/golang:1.22,localhost:5000/golang:1.22.4-4,localhost:5000/golang:1.22.4,localhost:5000/golang:1.22.4,localhost:5000/golang:1.22-al2,localhost:5000/golang:1.22.4-4-al2,localhost:5000/golang:1.22.4-al2,localhost:5000/golang:1.22.4-al2\",push=true
/override/root/../scripts/buildkit.sh build --frontend dockerfile.v0 --opt filename=Dockerfile.minimal-base-golang --opt platform=linux/amd64 --opt build-arg:OUTPUT_DEBUG_LOG= --opt build-arg:BASE_IMAGE=public.ecr.aws/eks-distro-build-tooling/compiler-base:some-previous-tag --opt build-arg:BUILT_BUILDER_IMAGE=localhost:5000/golang-builder:1.22-test-tag --opt build-arg:VERSIONED_VARIANT=1.22 --opt build-arg:AL_TAG=2 --opt build-arg:COMPILER_VERSION=1.22 --opt build-arg:COMPILER_FULL_VERSION=1.22.5-0 --opt build-arg:IS_COMPILER=true --progress plain --local dockerfile=./ --local context=. --opt target=final --export-cache type=inline --import-cache type=registry,ref=public.ecr.aws/eks-distro-build-tooling/golang-builder:some-previous-tag --opt no-cache=builder-golang-base --output type=image,oci-mediatypes=true,\"name=localhost:5000/golang:1.22-test-tag,localhost:5000/golang:1.22,localhost:5000/golang:1.22.5-0,localhost:5000/golang:1.22.5,localhost:5000/golang:1.22.5,localhost:5000/golang:1.22-al2,localhost:5000/golang:1.22.5-0-al2,localhost:5000/golang:1.22.5-al2,localhost:5000/golang:1.22.5-al2\",push=true
printf "\n\nExporting packages and files from base-golang-compiler-1.22-base final image\n\n"
/override/root/../scripts/buildkit.sh build --frontend dockerfile.v0 --opt filename=Dockerfile.minimal-helpers --opt platform=linux/amd64 --opt build-arg:OUTPUT_DEBUG_LOG= --opt build-arg:BUILT_BUILDER_IMAGE=localhost:5000/golang-builder:1.22-test-tag --opt build-arg:EXPORT_NAME=golang-compiler-1.22-base --progress plain --local dockerfile=./ --local context=. --opt target=export --output type=local,dest=/override/root/../eks-distro-base-minimal-packages/2
if [ -f /override/root/../eks-distro-base-minimal-packages/2/golang-compiler-1.22-base ]; then \
Expand Down
Loading
Loading