Skip to content

Commit 91a4d59

Browse files
committed
add support for aarch64 in workflow and go back to xbps-static
1 parent 3da6741 commit 91a4d59

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

.github/workflows/main.yml

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ on:
88
jobs:
99
build:
1010
strategy:
11-
max-parallel: 1
11+
max-parallel: 4
1212
matrix:
13-
arch: [x86_64, x86_64-musl]
13+
include:
14+
- { host: x86_64, target: x86_64 }
15+
- { host: x86_64-musl, target: x86_64-musl }
16+
- { host: x86_64, target: aarch64 }
17+
- { host: x86_64-musl, target: aarch64-musl }
1418
runs-on: ubuntu-22.04
15-
env:
16-
XBPS_TARGET_ARCH: ${{ matrix.arch }}
1719

1820
steps:
1921
- name: free space
@@ -36,52 +38,50 @@ jobs:
3638
ref: master
3739
path: void-packages
3840

39-
- name: checkout xbps
40-
uses: actions/checkout@v4
41-
with:
42-
repository: void-linux/xbps
43-
ref: 0.60.5
44-
path: xbps
45-
46-
- name: build and install xbps
47-
run: |
48-
sudo apt-get update
49-
sudo apt-get install -y libarchive-dev
50-
cd xbps
51-
./configure --enable-rpath --prefix=/opt/xbps/usr
52-
make -j4
53-
sudo make install clean
54-
5541
- name: copy librewolf into srcpkgs
5642
run: cp -rv librewolf/srcpkgs/librewolf void-packages/srcpkgs
5743

44+
- name: prepare xbps-static
45+
run: |
46+
mkdir -p /opt/xbps
47+
curl -LO http://repo-default.voidlinux.org/static/xbps-static-latest.x86_64-musl.tar.xz
48+
tar xvf xbps-static-latest.x86_64-musl.tar.xz -C /opt/xbps
49+
rm xbps-static-latest.x86_64-musl.tar.xz
50+
5851
- name: build
52+
env:
53+
XBPS_TARGET_ARCH: ${{ matrix.target }}
5954
run: |
6055
export PATH="/opt/xbps/usr/bin/:$PATH"
6156
cd void-packages
62-
./xbps-src -m masterdir-${{ matrix.arch }} -A ${{ matrix.arch }} binary-bootstrap
63-
./xbps-src pkg -j4 -m masterdir-${{ matrix.arch }} librewolf
57+
if [[ "${{ matrix.host }}" == "${{ matrix.target }}" ]]; then
58+
./xbps-src -A ${{ matrix.host }} binary-bootstrap
59+
./xbps-src pkg -j4 -A ${{ matrix.host }} librewolf
60+
else
61+
./xbps-src -a ${{ matrix.target }} -A ${{ matrix.host }} binary-bootstrap
62+
./xbps-src pkg -j4 -a ${{ matrix.target }} -A ${{ matrix.host }} librewolf
63+
fi
6464
6565
- name: sign
6666
env:
6767
XBPS_PASSPHRASE: ${{ secrets.SIGN_PASS }}
68+
XBPS_TARGET_ARCH: ${{ matrix.target }}
6869
working-directory: void-packages/hostdir/binpkgs/
6970
run: |
7071
export PATH="/opt/xbps/usr/bin/:$PATH"
7172
xbps-rindex -r $PWD
7273
xbps-rindex -s --signedby "index-0 <index@mailbox.org>" --privkey <(printf '%s' "${{ secrets.PRIV_KEY }}") $PWD
73-
xbps-rindex -S --privkey <(printf '%s' "${{ secrets.PRIV_KEY }}") $PWD/*.xbps
74+
xbps-rindex -S --privkey <(printf '%s' "${{ secrets.PRIV_KEY }}") *.xbps
7475
xbps-rindex -c $PWD
7576
7677
- name: checksum
7778
working-directory: void-packages/hostdir/binpkgs/
7879
run: |
79-
sha256sum $(echo librewolf-*.${{ matrix.arch }}.xbps)
80-
sha512sum $(echo librewolf-*.${{ matrix.arch }}.xbps)
80+
sha256sum $(echo *.xbps)
81+
sha512sum $(echo *.xbps)
8182
8283
- name: release
8384
uses: softprops/action-gh-release@v2
8485
with:
8586
files: |
86-
void-packages/hostdir/binpkgs/librewolf*
87-
void-packages/hostdir/binpkgs/*repodata
87+
void-packages/hostdir/binpkgs/*

0 commit comments

Comments
 (0)