Skip to content

Commit

Permalink
v1.26: Fix archive tags to not collide with main
Browse files Browse the repository at this point in the history
Use the release branch name instead of the main in archive tags, like in
v1.24.

Signed-off-by: Jarno Rajahalme <[email protected]>
  • Loading branch information
jrajahalme authored and sayboras committed Oct 11, 2023
1 parent 5f80211 commit 64b263a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-envoy-image-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
platforms: linux/amd64,linux/arm64
build-args: |
BUILDER_BASE=quay.io/cilium/cilium-envoy-builder-dev:${{ env.BAZEL_VERSION }}-${{ env.BUILDER_DOCKER_HASH }}
ARCHIVE_IMAGE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:main-archive-latest
ARCHIVE_IMAGE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:${{ github.base_ref }}-archive-latest
BAZEL_BUILD_OPTS=--remote_upload_local_results=false
cache-from: type=local,src=/tmp/buildx-cache
cache-to: type=local,dest=/tmp/buildx-cache,mode=max
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build-envoy-images-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ jobs:
BAZEL_BUILD_OPTS="--jobs=HOST_CPUS*.75"
BAZEL_TEST_OPTS=--test_timeout=300 --local_test_jobs=1
push: true
tags: quay.io/${{ github.repository_owner }}/cilium-envoy-builder:test-main-archive-latest
tags: quay.io/${{ github.repository_owner }}/cilium-envoy-builder:test-${{ github.ref_name }}-archive-latest

- name: Cache Docker layers
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
with:
path: /tmp/buildx-cache
key: docker-cache-tests
key: docker-cache-tests-${{ github.ref_name }}

- name: Clear cache
run: rm -rf /tmp/buildx-cache/*
Expand All @@ -104,7 +104,7 @@ jobs:
platforms: linux/amd64
build-args: |
BUILDER_BASE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:test-${{ env.BAZEL_VERSION }}-${{ env.BUILDER_DOCKER_HASH }}
ARCHIVE_IMAGE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:test-main-archive-latest
ARCHIVE_IMAGE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:test-${{ github.ref_name }}-archive-latest
BAZEL_BUILD_OPTS=--remote_upload_local_results=false
BAZEL_TEST_OPTS=--test_timeout=300 --local_test_jobs=1
cache-to: type=local,dest=/tmp/buildx-cache,mode=max
Expand Down Expand Up @@ -171,20 +171,20 @@ jobs:
COPY_CACHE_EXT=.new
BAZEL_BUILD_OPTS="--jobs=HOST_CPUS*.75"
push: true
tags: quay.io/${{ github.repository_owner }}/cilium-envoy-builder:main-archive-latest
tags: quay.io/${{ github.repository_owner }}/cilium-envoy-builder:${{ github.ref_name }}-archive-latest

- name: Cache Docker layers
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
with:
path: /tmp/buildx-cache
key: docker-cache-master
key: docker-cache-${{ github.ref_name }}

- name: Clear cache
run: |
rm -rf /tmp/buildx-cache/*
docker buildx prune -f
- name: Multi-arch build & push master latest
- name: Multi-arch build & push ${{ github.ref_name }} latest
uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4.1.1
id: docker_build_cd
with:
Expand All @@ -195,7 +195,7 @@ jobs:
build-args: |
BUILDER_BASE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:${{ env.BAZEL_VERSION }}-${{ env.BUILDER_DOCKER_HASH }}
BAZEL_BUILD_OPTS=--remote_upload_local_results=false
ARCHIVE_IMAGE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:main-archive-latest
ARCHIVE_IMAGE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:${{ github.ref_name }}-archive-latest
cache-to: type=local,dest=/tmp/buildx-cache,mode=max
push: true
tags: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
platforms: linux/amd64
build-args: |
BUILDER_BASE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder-dev:test-${{ env.BAZEL_VERSION }}-${{ env.BUILDER_DOCKER_HASH }}
ARCHIVE_IMAGE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:test-main-archive-latest
ARCHIVE_IMAGE=quay.io/${{ github.repository_owner }}/cilium-envoy-builder:test-${{ github.base_ref }}-archive-latest
BAZEL_BUILD_OPTS=--remote_upload_local_results=false
BAZEL_TEST_OPTS=--test_timeout=300 --local_test_jobs=1
cache-from: type=local,src=/tmp/buildx-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cilium-integration-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- reopened
- synchronize
branches:
- main
- v1.25
issue_comment:
types:
- created
Expand Down

0 comments on commit 64b263a

Please sign in to comment.