diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e24dea..894cf15 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,11 +8,12 @@ on: schedule: # At 00:00 on Monday. - cron: "0 0 * * 1" - workflow_dispatch: + concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} cancel-in-progress: true + jobs: build: name: Build @@ -39,14 +40,17 @@ jobs: - "1.28" - "1.29" steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up QEMU id: qemu - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 + + # - name: Setup upterm session + # uses: lhotari/action-upterm@v1 - name: Publish to GitHub Container Registry env: diff --git a/nonroot/Makefile b/nonroot/Makefile index d9790ae..d7cd10c 100644 --- a/nonroot/Makefile +++ b/nonroot/Makefile @@ -7,7 +7,7 @@ RELEASE ?= 1.20 VERSION ?= $(shell curl -fsSL https://storage.googleapis.com/kubernetes-release/release/stable-$(RELEASE).txt) SRC_REG ?= -DOCKER_PLATFORMS := linux/amd64 linux/386 linux/arm64 linux/ppc64le linux/s390x +DOCKER_PLATFORMS := linux/amd64 linux/arm64 PLATFORM ?= $(firstword $(DOCKER_PLATFORMS)) TAG = $(VERSION)_$(subst /,_,$(PLATFORM)) diff --git a/root/Makefile b/root/Makefile index f8a8599..ab1d2dd 100644 --- a/root/Makefile +++ b/root/Makefile @@ -7,7 +7,7 @@ RELEASE ?= 1.20 VERSION ?= $(shell curl -fsSL https://storage.googleapis.com/kubernetes-release/release/stable-$(RELEASE).txt) SRC_REG ?= -DOCKER_PLATFORMS := linux/amd64 linux/386 linux/arm64 linux/ppc64le linux/s390x +DOCKER_PLATFORMS := linux/amd64 linux/arm64 PLATFORM ?= $(firstword $(DOCKER_PLATFORMS)) TAG = $(VERSION)_$(subst /,_,$(PLATFORM))