git.iko.soy/typeable/oauth2-proxy
on master help sign in
Merge pull request #2798 from oauth2-proxy/release/v7.7.0

fix(ci): testing full release cycle before release branches can be merged

commitcda641473f5908798d16f0bb5c5b8907be140d88 authorJoel Speed <Joel.speed@hotmail.co.uk> dateWed 2 Oct 2024, 15:17 (2 years ago) parentf5d367007230ea
3 files changed+15โˆ’2
.github/workflows/ci.yaml+14 CHANGELOG.md+1 Makefileโˆ’2
.github/workflows/ci.yaml+14
@@ -41,9 +41,16 @@ jobs:
4141 make lint
4242
4343 - name: Build
44+ if: (!startsWith(github.head_ref, 'release'))
4445 run: |
4546 make build
4647
48+ # For release testing
49+ - name: Build All
50+ if: github.base_ref == 'master' && startsWith(github.head_ref, 'release')
51+ run: |
52+ make release
53+
4754 - name: Test
4855 env:
4956 CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
@@ -64,5 +71,12 @@ jobs:
6471 uses: docker/setup-buildx-action@v3
6572
6673 - name: Docker Build
74+ if: (!startsWith(github.head_ref, 'release'))
6775 run: |
6876 make docker
77+
78+ # For release testing
79+ - name: Docker Build All
80+ if: github.base_ref == 'master' && startsWith(github.head_ref, 'release')
81+ run: |
82+ make docker-all
CHANGELOG.md+1
@@ -22,6 +22,7 @@
2222- ๐Ÿ“– Improved docs
2323
2424## Important Notes
25+- Remove support of arm/v6 for distroless image runtime. Alpine tags still support arm/v6.
2526
2627## Breaking Changes
2728
Makefileโˆ’2
@@ -71,7 +71,6 @@ docker-all: docker
7171 $(DOCKER_BUILDX) --platform linux/amd64 -t $(REGISTRY)/$(REPOSITORY):latest-amd64 -t $(REGISTRY)/$(REPOSITORY):${VERSION}-amd64 .
7272 $(DOCKER_BUILDX) --platform linux/arm64 -t $(REGISTRY)/$(REPOSITORY):latest-arm64 -t $(REGISTRY)/$(REPOSITORY):${VERSION}-arm64 .
7373 $(DOCKER_BUILDX) --platform linux/ppc64le -t $(REGISTRY)/$(REPOSITORY):latest-ppc64le -t $(REGISTRY)/$(REPOSITORY):${VERSION}-ppc64le .
74โˆ’ $(DOCKER_BUILDX) --platform linux/arm/v6 -t $(REGISTRY)/$(REPOSITORY):latest-armv6 -t $(REGISTRY)/$(REPOSITORY):${VERSION}-armv6 .
7574 $(DOCKER_BUILDX) --platform linux/arm/v7 -t $(REGISTRY)/$(REPOSITORY):latest-armv7 -t $(REGISTRY)/$(REPOSITORY):${VERSION}-armv7 .
7675 $(DOCKER_BUILDX) --platform linux/s390x -t $(REGISTRY)/$(REPOSITORY):latest-s390x -t $(REGISTRY)/$(REPOSITORY):${VERSION}-s390x .
7776
@@ -80,7 +79,6 @@ docker-push-all: docker-push
8079 $(DOCKER_BUILDX_PUSH) --platform linux/amd64 -t $(REGISTRY)/$(REPOSITORY):latest-amd64 -t $(REGISTRY)/$(REPOSITORY):${VERSION}-amd64 .
8180 $(DOCKER_BUILDX_PUSH) --platform linux/arm64 -t $(REGISTRY)/$(REPOSITORY):latest-arm64 -t $(REGISTRY)/$(REPOSITORY):${VERSION}-arm64 .
8281 $(DOCKER_BUILDX_PUSH) --platform linux/ppc64le -t $(REGISTRY)/$(REPOSITORY):latest-ppc64le -t $(REGISTRY)/$(REPOSITORY):${VERSION}-ppc64le .
83โˆ’ $(DOCKER_BUILDX_PUSH) --platform linux/arm/v6 -t $(REGISTRY)/$(REPOSITORY):latest-armv6 -t $(REGISTRY)/$(REPOSITORY):${VERSION}-armv6 .
8482 $(DOCKER_BUILDX_PUSH) --platform linux/arm/v7 -t $(REGISTRY)/$(REPOSITORY):latest-armv7 -t $(REGISTRY)/$(REPOSITORY):${VERSION}-armv7 .
8583 $(DOCKER_BUILDX_PUSH) --platform linux/s390x -t $(REGISTRY)/$(REPOSITORY):latest-s390x -t $(REGISTRY)/$(REPOSITORY):${VERSION}-s390x .
8684