Skip to content

Commit e5388ef

Browse files
committed
Do not use buildx
1 parent 6b5db06 commit e5388ef

File tree

1 file changed

+14
-24
lines changed

1 file changed

+14
-24
lines changed

.github/workflows/workflow.yml

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,40 +12,34 @@ env:
1212
BASE_IMAGE_STABILITY_TAG: 2.16.4
1313
NGINX127: '1.27.4'
1414
NGINX126: '1.26.3'
15-
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
16-
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
1715

1816
jobs:
1917
nginx127-build:
2018
strategy:
2119
matrix:
22-
platform:
23-
- linux/amd64
24-
- linux/arm64
20+
arch:
21+
- amd64
22+
- arm64
2523
include:
26-
- platform: linux/amd64
24+
- arch: amd64
2725
runner: ubuntu-24.04
28-
arch: amd64
29-
- platform: linux/arm64
26+
- arch: arm64
3027
runner: ubuntu-24.04-arm
31-
arch: arm64
3228
runs-on: ${{ matrix.runner }}
3329
steps:
3430
- uses: actions/checkout@v4
3531
- uses: docker/login-action@v3
3632
with:
3733
username: ${{ secrets.DOCKER_USERNAME }}
3834
password: ${{ secrets.DOCKER_PASSWORD }}
39-
- uses: docker/setup-buildx-action@v3
4035
- name: build and push
4136
env:
4237
NGINX_VER: ${{ env.NGINX127 }}
4338
ARCH: ${{ matrix.arch }}
44-
PLATFORM: ${{ matrix.platform }}
4539
run: |
46-
make buildx-build
40+
make
4741
make test
48-
make buildx-push
42+
make push
4943
nginx127-push:
5044
runs-on: ubuntu-latest
5145
needs:
@@ -65,33 +59,29 @@ jobs:
6559
nginx126-build:
6660
strategy:
6761
matrix:
68-
platform:
69-
- linux/amd64
70-
- linux/arm64
62+
arch:
63+
- amd64
64+
- arm64
7165
include:
72-
- platform: linux/amd64
66+
- arch: amd64
7367
runner: ubuntu-24.04
74-
arch: amd64
75-
- platform: linux/arm64
68+
- arch: arm64
7669
runner: ubuntu-24.04-arm
77-
arch: arm64
7870
runs-on: ${{ matrix.runner }}
7971
steps:
8072
- uses: actions/checkout@v4
8173
- uses: docker/login-action@v3
8274
with:
8375
username: ${{ secrets.DOCKER_USERNAME }}
8476
password: ${{ secrets.DOCKER_PASSWORD }}
85-
- uses: docker/setup-buildx-action@v3
8677
- name: build and push
8778
env:
8879
NGINX_VER: ${{ env.NGINX126 }}
8980
ARCH: ${{ matrix.arch }}
90-
PLATFORM: ${{ matrix.platform }}
9181
run: |
92-
make buildx-build
82+
make
9383
make test
94-
make buildx-push
84+
make push
9585
nginx126-push:
9686
runs-on: ubuntu-latest
9787
needs:

0 commit comments

Comments
 (0)