From 9a22a21bd5051fb22bbdc5bec1d7926f7d022813 Mon Sep 17 00:00:00 2001 From: Natalie Arellano Date: Thu, 25 Jul 2024 10:32:49 -0400 Subject: [PATCH 1/3] Bump default lifecycle binary version from 0.19.6 to 0.20.0 Signed-off-by: Natalie Arellano --- acceptance/testdata/pack_fixtures/report_output.txt | 2 +- internal/builder/lifecycle.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/acceptance/testdata/pack_fixtures/report_output.txt b/acceptance/testdata/pack_fixtures/report_output.txt index 88a36e2e2..6e768cb64 100644 --- a/acceptance/testdata/pack_fixtures/report_output.txt +++ b/acceptance/testdata/pack_fixtures/report_output.txt @@ -2,7 +2,7 @@ Pack: Version: {{ .Version }} OS/Arch: {{ .OS }}/{{ .Arch }} -Default Lifecycle Version: 0.19.6 +Default Lifecycle Version: 0.20.0 Supported Platform APIs: 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.10, 0.11, 0.12, 0.13 diff --git a/internal/builder/lifecycle.go b/internal/builder/lifecycle.go index 4f2d4df94..35cd91f44 100644 --- a/internal/builder/lifecycle.go +++ b/internal/builder/lifecycle.go @@ -14,7 +14,7 @@ import ( // A snapshot of the latest tested lifecycle version values const ( - DefaultLifecycleVersion = "0.19.6" + DefaultLifecycleVersion = "0.20.0" DefaultBuildpackAPIVersion = "0.2" ) From 0cda9d00224b0f50999e0ddeb9ce77f3ade42928 Mon Sep 17 00:00:00 2001 From: Hiroshi Hayakawa Date: Tue, 30 Jul 2024 13:50:18 +0900 Subject: [PATCH 2/3] Add ${{ matrix.suffix }} to the source tag for retagging. Signed-off-by: Hiroshi Hayakawa --- .github/workflows/delivery-docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/delivery-docker.yml b/.github/workflows/delivery-docker.yml index a82f859b5..b83ab8be8 100644 --- a/.github/workflows/delivery-docker.yml +++ b/.github/workflows/delivery-docker.yml @@ -74,8 +74,8 @@ jobs: - name: Tag Image as Base if: ${{ (github.event.release != '' || github.event.inputs.tag_latest) && matrix.config == 'base' }} run: | - crane copy ${{ env.IMG_NAME }}:${{ steps.version.outputs.result }} ${{ env.IMG_NAME }}:base + crane copy ${{ env.IMG_NAME }}:${{ steps.version.outputs.result }}${{ matrix.suffix }} ${{ env.IMG_NAME }}:base - name: Tag Image as Latest if: ${{ (github.event.release != '' || github.event.inputs.tag_latest) && matrix.config != 'base' }} run: | - crane copy ${{ env.IMG_NAME }}:${{ steps.version.outputs.result }} ${{ env.IMG_NAME }}:latest + crane copy ${{ env.IMG_NAME }}:${{ steps.version.outputs.result }}${{ matrix.suffix }} ${{ env.IMG_NAME }}:latest From e885ffe48ece7dc42dff716e73596cbbb4f82bcf Mon Sep 17 00:00:00 2001 From: Hiroshi Hayakawa Date: Tue, 30 Jul 2024 14:25:02 +0900 Subject: [PATCH 3/3] Fix the helper script for testing the GitHub Action workflows on forked repositories. Signed-off-by: Hiroshi Hayakawa --- tools/test-fork.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test-fork.sh b/tools/test-fork.sh index 84a7d770a..50389e6be 100755 --- a/tools/test-fork.sh +++ b/tools/test-fork.sh @@ -53,7 +53,7 @@ sed -i '' "/- config: windows-lcow/,+4d" $wfdir/build.yml echo "Replacing the registry account with owned one (assumes DOCKER_PASSWORD and DOCKER_USERNAME have been added to GitHub secrets, if not using ghcr.io)" sed -i '' "s/buildpacksio\/pack/$registry\/$username\/$reponame/g" $wfdir/check-latest-release.yml -sed -i '' "/REPO_NAME: 'index.docker.io'/ s/index.docker.io/$registry/g" $wfdir/delivery-docker.yml +sed -i '' "/REGISTRY_NAME: 'index.docker.io'/ s/index.docker.io/$registry/g" $wfdir/delivery-docker.yml sed -i '' "/USER_NAME: 'buildpacksio'/ s/buildpacksio/$username/g" $wfdir/delivery-docker.yml if [[ $registry != "index.docker.io" ]]; then