Skip to content

Commit 88564a3

Browse files
committed
Revert "ci: add support for target OS and architecture in build configuration"
This reverts commit 5a71ce1.
1 parent 5e7e09f commit 88564a3

File tree

3 files changed

+4
-24
lines changed

3 files changed

+4
-24
lines changed

.github/workflows/build-dev.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ on:
1717
jobs:
1818
build:
1919
runs-on: ubuntu-latest
20-
strategy:
21-
matrix:
22-
os: [ linux ]
23-
arch: [ amd64 ]
2420
steps:
2521
- name: Checkout
2622
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -60,13 +56,10 @@ jobs:
6056
provenance: false
6157
build-args: |
6258
APP_VERSION=dev-build.${{ steps.vars.outputs.short_sha }}
63-
TARGET_OS=${{ matrix.os }}
64-
TARGET_ARCH=${{ matrix.arch }}
6559
push: false
6660
load: true
6761
tags: ${{ steps.meta.outputs.tags }}
6862
labels: ${{ steps.meta.outputs.labels }}
69-
platforms: ${{ matrix.os }}/${{ matrix.arch }}
7063
cache-from: type=gha
7164
cache-to: type=gha,mode=max
7265

@@ -90,11 +83,8 @@ jobs:
9083
provenance: false
9184
build-args: |
9285
APP_VERSION=dev-build.${{ steps.vars.outputs.short_sha }}
93-
TARGET_OS=${{ matrix.os }}
94-
TARGET_ARCH=${{ matrix.arch }}
9586
push: ${{ github.event_name != 'pull_request' }}
9687
tags: ${{ steps.meta.outputs.tags }}
9788
labels: ${{ steps.meta.outputs.labels }}
98-
platforms: ${{ matrix.os }}/${{ matrix.arch }}
9989
cache-from: type=gha
10090
cache-to: type=gha,mode=max

.github/workflows/build.yaml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ on:
1515
jobs:
1616
build:
1717
runs-on: ubuntu-latest
18-
strategy:
19-
matrix:
20-
os:
21-
- linux
22-
arch:
23-
- amd64
24-
- arm64
2518
steps:
2619
- name: Checkout
2720
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -57,11 +50,11 @@ jobs:
5750
provenance: false
5851
build-args: |
5952
APP_VERSION=${{ github.ref_name }}
60-
TARGET_OS=${{ matrix.os }}
61-
TARGET_ARCH=${{ matrix.arch }}
6253
push: ${{ startsWith(github.ref, 'refs/tags/') }}
6354
tags: ${{ steps.meta.outputs.tags }}
6455
labels: ${{ steps.meta.outputs.labels }}
65-
platforms: ${{ matrix.os }}/${{ matrix.arch }}
56+
platforms: |
57+
linux/amd64
58+
linux/arm64
6659
cache-from: type=gha
6760
cache-to: type=gha,mode=max

Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
FROM golang:1.24.5@sha256:14fd8a55e59a560704e5fc44970b301d00d344e45d6b914dda228e09f359a088 AS build-stage
33

44
ARG APP_VERSION=dev
5-
ARG TARGET_OS=linux
6-
ARG TARGET_ARCH=amd64
75

86
# Set destination for COPY
97
WORKDIR /app
@@ -22,8 +20,7 @@ COPY . ./
2220
# Set build environment
2321
ENV GOCACHE=/root/.cache/go-build \
2422
CGO_ENABLED=0 \
25-
GOOS=${TARGET_OS} \
26-
GOARCH=${TARGET_ARCH}
23+
GOOS=linux
2724

2825
# Build and strip binary
2926
RUN --mount=type=cache,target=/go/pkg/mod/ \

0 commit comments

Comments
 (0)