change correct workflow

This commit is contained in:
techknowlogick 2023-03-04 23:01:25 -05:00
parent 1270e01196
commit 8d397517c4
2 changed files with 12 additions and 13 deletions

View File

@ -8,20 +8,27 @@ jobs:
docker: docker:
strategy: strategy:
matrix: matrix:
arch: ['arm64', 'amd64'] arch: ['ubuntu-latest', 'arm-ubuntu-latest']
go-version: ['1.20'] go-version: ['1.20']
git-version: ['2.38.4'] git-version: ['2.38.4']
golangci-lint-version: ['1.51.0'] golangci-lint-version: ['1.51.0']
runs-on: ubuntu-latest runs-on: ${{ matrix.arch }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- run: |
if [ "${{ matrix.arch }}" == "ubuntu-latest" ]; then
echo ::set-output name=value::amd64
else
echo ::set-output name=value::arm64
fi
id: arch
- name: setup buildx - name: setup buildx
uses: https://github.com/docker/setup-buildx-action@v2 uses: https://github.com/docker/setup-buildx-action@v2
- name: build image - name: build image
uses: https://github.com/docker/build-push-action@v4 uses: https://github.com/docker/build-push-action@v4
with: with:
push: false push: false
tags: gitea/test_env:linux-${{ matrix.arch }} tags: gitea/test_env:linux-${{ matrix.go-version }}-${{ steps.arch.outputs.value }}
build-args: | build-args: |
GOLANG_VERSION=${{ matrix.go-version }} GOLANG_VERSION=${{ matrix.go-version }}
GIT_VERSION=${{ matrix.git-version }} GIT_VERSION=${{ matrix.git-version }}

View File

@ -7,27 +7,19 @@ jobs:
docker: docker:
strategy: strategy:
matrix: matrix:
arch: ['ubuntu-latest', 'arm-ubuntu-latest']
go-version: ['1.20'] go-version: ['1.20']
git-version: ['2.38.4'] git-version: ['2.38.4']
golangci-lint-version: ['1.51.0'] golangci-lint-version: ['1.51.0']
runs-on: arm-ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- run: |
if [ "${{ matrix.arch }}" == "ubuntu-latest" ]; then
echo ::set-output name=value::amd64
else
echo ::set-output name=value::arm64
fi
id: arch
- name: setup buildx - name: setup buildx
uses: https://github.com/docker/setup-buildx-action@v2 uses: https://github.com/docker/setup-buildx-action@v2
- name: build image - name: build image
uses: https://github.com/docker/build-push-action@v4 uses: https://github.com/docker/build-push-action@v4
with: with:
push: false push: false
tags: gitea/test_env:linux-${{ matrix.go-version }}-${{ steps.arch.outputs.value }} tags: gitea/test_env:linux-${{ matrix.go-version }}-amd64
build-args: | build-args: |
GOLANG_VERSION=${{ matrix.go-version }} GOLANG_VERSION=${{ matrix.go-version }}
GIT_VERSION=${{ matrix.git-version }} GIT_VERSION=${{ matrix.git-version }}