Skip to content

Commit 77b783e

Browse files
committed
build: replace arm64 with x86 (386/i686) across goreleaser, AUR and CI
1 parent c818e92 commit 77b783e

File tree

5 files changed

+26
-21
lines changed

5 files changed

+26
-21
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,9 @@ jobs:
8989
- goos: linux
9090
goarch: amd64
9191
- goos: linux
92-
goarch: arm64
92+
goarch: "386"
9393
- goos: darwin
9494
goarch: amd64
95-
- goos: darwin
96-
goarch: arm64
9795

9896
steps:
9997
- name: Checkout

.github/workflows/release.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
run: go test -race ./...
5757

5858
# goreleaser v2 requires private_key to be a FILE PATH, not inline content.
59-
# Writes the secret to ~/.ssh/aur_key and sets has_key=true/false.
60-
# If AUR_KEY is absent, the AUR publisher is skipped via --skip=aurs.
59+
# This step writes the secret to a temp file and exposes its path.
60+
# If AUR_KEY is absent the AUR publisher is skipped via --skip=aurs.
6161
- name: Setup AUR key
6262
id: aur
6363
env:
@@ -67,9 +67,11 @@ jobs:
6767
mkdir -p ~/.ssh
6868
echo "$AUR_KEY_CONTENT" > ~/.ssh/aur_key
6969
chmod 600 ~/.ssh/aur_key
70-
echo "has_key=true" >> "$GITHUB_OUTPUT"
70+
echo "key_path=$HOME/.ssh/aur_key" >> "$GITHUB_OUTPUT"
71+
echo "goreleaser_args=release --clean" >> "$GITHUB_OUTPUT"
7172
else
72-
echo "has_key=false" >> "$GITHUB_OUTPUT"
73+
echo "key_path=" >> "$GITHUB_OUTPUT"
74+
echo "goreleaser_args=release --clean --skip=aurs" >> "$GITHUB_OUTPUT"
7375
echo "::warning title=AUR_KEY ausente::Publicação no AUR ignorada. Configure o secret AUR_KEY para habilitar."
7476
fi
7577
@@ -78,14 +80,14 @@ jobs:
7880
with:
7981
distribution: goreleaser
8082
version: "~> v2"
81-
args: >-
82-
release --clean
83-
${{ steps.aur.outputs.has_key != 'true' && '--skip=aurs' || '' }}
83+
args: ${{ steps.aur.outputs.goreleaser_args }}
8484
env:
85+
# GitHub token to create the release and upload assets.
86+
# GITHUB_TOKEN is automatically injected by Actions — no extra configuration needed.
8587
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
86-
# goreleaser v2 expects a file path for private_key, not inline key content.
87-
# Points to the file written by the "Setup AUR key" step above.
88-
AUR_KEY: /home/runner/.ssh/aur_key
88+
# Path to the SSH private key file written by the "Setup AUR key" step above.
89+
# goreleaser v2 requires a file path here, not inline key content.
90+
AUR_KEY: ${{ steps.aur.outputs.key_path }}
8991

9092
# ── Completion notification ───────────────────────────────────────────────────
9193
notify:

.goreleaser.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,12 @@ builds:
3939

4040
goarch:
4141
- amd64
42-
- arm64
42+
- "386"
43+
44+
# darwin/386 is not supported since Go 1.15 / macOS Catalina
45+
ignore:
46+
- goos: darwin
47+
goarch: "386"
4348

4449
# Compilation flags
4550
flags:

aur/.SRCINFO

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ pkgbase = cpp-gen-bin
44
pkgrel = 1
55
url = https://github.com/matpdev/cpp-gen
66
arch = x86_64
7-
arch = aarch64
7+
arch = i686
88
license = MIT
99
provides = cpp-gen
1010
conflicts = cpp-gen
1111
options = !strip
1212
source_x86_64 = cpp-gen-bin-0.1.0-x86_64.tar.gz::https://github.com/matpdev/cpp-gen/releases/download/v0.1.0/cpp-gen_0.1.0_linux_amd64.tar.gz
1313
sha256sums_x86_64 = SKIP
14-
source_aarch64 = cpp-gen-bin-0.1.0-aarch64.tar.gz::https://github.com/matpdev/cpp-gen/releases/download/v0.1.0/cpp-gen_0.1.0_linux_arm64.tar.gz
15-
sha256sums_aarch64 = SKIP
14+
source_i686 = cpp-gen-bin-0.1.0-i686.tar.gz::https://github.com/matpdev/cpp-gen/releases/download/v0.1.0/cpp-gen_0.1.0_linux_386.tar.gz
15+
sha256sums_i686 = SKIP
1616

1717
pkgname = cpp-gen-bin

aur/PKGBUILD

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pkgname=cpp-gen-bin
1515
pkgver=0.1.0
1616
pkgrel=1
1717
pkgdesc='Modern C++ project generator with CMake, package managers, IDE configurations and development tools'
18-
arch=('x86_64' 'aarch64')
18+
arch=('x86_64' 'i686')
1919
url='https://github.com/matpdev/cpp-gen'
2020
license=('MIT')
2121
provides=('cpp-gen')
@@ -25,12 +25,12 @@ options=('!strip')
2525
source_x86_64=(
2626
"${pkgname}-${pkgver}-x86_64.tar.gz::https://github.com/matpdev/cpp-gen/releases/download/v${pkgver}/cpp-gen_${pkgver}_linux_amd64.tar.gz"
2727
)
28-
source_aarch64=(
29-
"${pkgname}-${pkgver}-aarch64.tar.gz::https://github.com/matpdev/cpp-gen/releases/download/v${pkgver}/cpp-gen_${pkgver}_linux_arm64.tar.gz"
28+
source_i686=(
29+
"${pkgname}-${pkgver}-i686.tar.gz::https://github.com/matpdev/cpp-gen/releases/download/v${pkgver}/cpp-gen_${pkgver}_linux_386.tar.gz"
3030
)
3131

3232
sha256sums_x86_64=('SKIP')
33-
sha256sums_aarch64=('SKIP')
33+
sha256sums_i686=('SKIP')
3434

3535
package() {
3636
cd "${srcdir}"

0 commit comments

Comments
 (0)