Skip to content

Commit a51234e

Browse files
authored
fix(ci): make it work again (#52)
1 parent 63b8ab6 commit a51234e

File tree

3 files changed

+26
-43
lines changed

3 files changed

+26
-43
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
sudo apt -y update
1313
sudo apt -y install git golang liblzma-dev
1414
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1616

1717
- name: Build
1818
run: go build .

.github/workflows/goreleaser.yml

+23-23
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: macos-latest
1111
steps:
1212
- id: osxcross-macos-sdk
13-
uses: actions/cache@v2
13+
uses: actions/cache@v4
1414
with:
1515
path: osxcross/tarballs
1616
key: ${{ runner.os }}-osxcross-macos-sdk
@@ -24,14 +24,14 @@ jobs:
2424
mv MacOSX*.sdk.tar.xz tarballs/
2525
popd
2626
27-
- uses: actions/upload-artifact@master
27+
- uses: actions/upload-artifact@v4
2828
with:
2929
name: osxcross-tarballs
3030
path: osxcross/tarballs
3131

3232
goreleaser:
3333
runs-on: ubuntu-latest
34-
container: fedora:34
34+
container: fedora:41
3535
needs: macos-sdk
3636

3737
steps:
@@ -45,16 +45,16 @@ jobs:
4545
4646
- name: Setup cross compile environment for Linux ARMv7
4747
env:
48-
CC: arm-linux-gnueabihf-gcc
49-
CXX: arm-linux-gnueabihf-c++
48+
CC: arm-linux-gnueabi-gcc
49+
CXX: arm-linux-gnueabi-c++
5050
CFLAGS: -fPIC
5151
run: |
52-
dnf -y copr enable lantw44/arm-linux-gnueabihf-toolchain
53-
dnf -y install arm-linux-gnueabihf-{binutils,gcc,glibc}
52+
dnf -y copr enable lantw44/arm-linux-gnueabi-toolchain
53+
dnf -y install arm-linux-gnueabi-{binutils,gcc,glibc}
5454
mkdir /linux-armv7-buildroot
5555
pushd /linux-armv7-buildroot
56-
tar -xvf $HOME/rpmbuild/SOURCES/xz-*.tar.xz
57-
pushd $(basename $HOME/rpmbuild/SOURCES/xz-*.tar.xz .tar.xz)
56+
tar -xvf $HOME/rpmbuild/SOURCES/xz-*.tar.gz
57+
pushd $(basename $HOME/rpmbuild/SOURCES/xz-*.tar.gz .tar.gz)
5858
./autogen.sh
5959
./configure --host=armv7 --prefix=/linux-armv7-buildroot/sys-root
6060
make -j$(nproc) install
@@ -70,8 +70,8 @@ jobs:
7070
dnf -y install aarch64-linux-gnu-{binutils,gcc,glibc}
7171
mkdir /linux-aarch64-buildroot
7272
pushd /linux-aarch64-buildroot
73-
tar -xvf $HOME/rpmbuild/SOURCES/xz-*.tar.xz
74-
pushd $(basename $HOME/rpmbuild/SOURCES/xz-*.tar.xz .tar.xz)
73+
tar -xvf $HOME/rpmbuild/SOURCES/xz-*.tar.gz
74+
pushd $(basename $HOME/rpmbuild/SOURCES/xz-*.tar.gz .tar.gz)
7575
./autogen.sh
7676
./configure --host=aarch64 --prefix=/linux-aarch64-buildroot/sys-root
7777
make -j$(nproc) install
@@ -82,18 +82,18 @@ jobs:
8282
run: git clone https://github.com/tpoechtrager/osxcross /osxcross
8383

8484
- id: osxcross-target
85-
uses: actions/cache@v2
85+
uses: actions/cache@v4
8686
with:
8787
path: /osxcross/target
8888
key: ${{ runner.os }}-osxcross-target
8989

90-
- uses: actions/download-artifact@master
90+
- uses: actions/download-artifact@v4
9191
if: steps.osxcross-target.outputs.cache-hit != 'true'
9292
with:
9393
name: osxcross-tarballs
9494
path: /osxcross/tarballs
9595

96-
- uses: geekyeggo/delete-artifact@v1
96+
- uses: geekyeggo/delete-artifact@v5
9797
with:
9898
name: osxcross-tarballs
9999

@@ -109,10 +109,10 @@ jobs:
109109
run: |
110110
mkdir /darwin-amd64-buildroot
111111
pushd /darwin-amd64-buildroot
112-
tar -xvf $HOME/rpmbuild/SOURCES/xz-*.tar.xz
113-
pushd $(basename $HOME/rpmbuild/SOURCES/xz-*.tar.xz .tar.xz)
112+
tar -xvf $HOME/rpmbuild/SOURCES/xz-*.tar.gz
113+
pushd $(basename $HOME/rpmbuild/SOURCES/xz-*.tar.gz .tar.gz)
114114
PATH=/osxcross/target/bin:$PATH ./autogen.sh
115-
PATH=/osxcross/target/bin:$PATH ./configure --host=x86_64-apple-darwin20.2 --prefix=/darwin-amd64-buildroot/sys-root --enable-shared=no
115+
PATH=/osxcross/target/bin:$PATH ./configure --host=x86_64-apple-darwin24 --prefix=/darwin-amd64-buildroot/sys-root --enable-shared=no
116116
PATH=/osxcross/target/bin:$PATH make -j$(nproc) install
117117
popd
118118
popd
@@ -124,22 +124,22 @@ jobs:
124124
run: |
125125
mkdir /darwin-aarch64-buildroot
126126
pushd /darwin-aarch64-buildroot
127-
tar -xvf $HOME/rpmbuild/SOURCES/xz-*.tar.xz
128-
pushd $(basename $HOME/rpmbuild/SOURCES/xz-*.tar.xz .tar.xz)
127+
tar -xvf $HOME/rpmbuild/SOURCES/xz-*.tar.gz
128+
pushd $(basename $HOME/rpmbuild/SOURCES/xz-*.tar.gz .tar.gz)
129129
PATH=/osxcross/target/bin:$PATH ./autogen.sh
130-
PATH=/osxcross/target/bin:$PATH ./configure --host=aarch64-apple-darwin20.2 --prefix=/darwin-aarch64-buildroot/sys-root --enable-shared=no
130+
PATH=/osxcross/target/bin:$PATH ./configure --host=aarch64-apple-darwin24 --prefix=/darwin-aarch64-buildroot/sys-root --enable-shared=no
131131
PATH=/osxcross/target/bin:$PATH make -j$(nproc) install
132132
popd
133133
popd
134134
135-
- uses: actions/checkout@v2
135+
- uses: actions/checkout@v4
136136

137137
- name: Add $GITHUB_WORKSPACE to git safe.directory
138138
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
139139

140-
- uses: goreleaser/goreleaser-action@v3
140+
- uses: goreleaser/goreleaser-action@v6
141141
with:
142142
version: latest
143-
args: release --rm-dist
143+
args: release --clean
144144
env:
145145
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.goreleaser.yml

+2-19
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,6 @@ checksum:
44
env:
55
- CGO_ENABLED=1
66
builds:
7-
- id: build-windows-386
8-
env:
9-
- CC=i686-w64-mingw32-gcc
10-
- CXX=i686-w64-mingw32-g++
11-
goos:
12-
- windows
13-
goarch:
14-
- "386"
15-
ldflags:
16-
- '-extldflags "-static -s -w"'
177
- id: build-windows-amd64
188
env:
199
- CC=x86_64-w64-mingw32-gcc
@@ -24,13 +14,6 @@ builds:
2414
- amd64
2515
ldflags:
2616
- '-extldflags "-static -s -w"'
27-
- id: build-linux-386
28-
goos:
29-
- linux
30-
goarch:
31-
- "386"
32-
ldflags:
33-
- '-extldflags "-static -s -w"'
3417
- id: build-linux-amd64
3518
goos:
3619
- linux
@@ -40,8 +23,8 @@ builds:
4023
- '-extldflags "-static -s -w"'
4124
- id: build-linux-armv7
4225
env:
43-
- CC=arm-linux-gnueabihf-gcc
44-
- CXX=arm-linux-gnueabihf-c++
26+
- CC=arm-linux-gnueabi-gcc
27+
- CXX=arm-linux-gnueabi-c++
4528
- CGO_CFLAGS=-I/linux-armv7-buildroot/sys-root/include
4629
- CGO_LDFLAGS=-L/linux-armv7-buildroot/sys-root/lib
4730
goos:

0 commit comments

Comments
 (0)