Skip to content

Commit 88390b9

Browse files
authored
fix workflow
1 parent 29714fb commit 88390b9

File tree

1 file changed

+24
-15
lines changed

1 file changed

+24
-15
lines changed

.github/workflows/main.yml

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,16 @@ jobs:
1313
arch: [x86_64, x86_64-musl]
1414
runs-on: ubuntu-22.04
1515
env:
16-
XBPS_PASSPHRASE: ${{ secrets.SIGN_PASS }}
1716
XBPS_TARGET_ARCH: ${{ matrix.arch }}
1817

1918
steps:
19+
- name: free space
20+
run: |
21+
sudo rm -rf /usr/share/dotnet
22+
sudo rm -rf /usr/local/lib/android
23+
sudo rm -rf /opt/ghc
24+
sudo rm -rf /opt/hostedtoolcache/CodeQL
25+
2026
- name: checkout librewolf-void
2127
uses: actions/checkout@v4
2228
with:
@@ -30,22 +36,24 @@ jobs:
3036
ref: master
3137
path: void-packages
3238

33-
- name: copy
34-
run: cp -rv librewolf/srcpkgs/librewolf void-packages/srcpkgs
39+
- name: checkout xbps
40+
uses: actions/checkout@v4
41+
with:
42+
repository: void-linux/xbps
43+
ref: 0.60.3
44+
path: xbps
3545

36-
- name: prepare xbps-static
46+
- name: build and install xbps
3747
run: |
38-
mkdir -p /opt/xbps
39-
curl -LO http://repo-default.voidlinux.org/static/xbps-static-latest.x86_64-musl.tar.xz
40-
tar xvf xbps-static-latest.x86_64-musl.tar.xz -C /opt/xbps
41-
rm xbps-static-latest.x86_64-musl.tar.xz
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
4254
43-
- name: free space
44-
run: |
45-
sudo rm -rf /usr/share/dotnet
46-
sudo rm -rf /usr/local/lib/android
47-
sudo rm -rf /opt/ghc
48-
sudo rm -rf /opt/hostedtoolcache/CodeQL
55+
- name: copy librewolf into srcpkgs
56+
run: cp -rv librewolf/srcpkgs/librewolf void-packages/srcpkgs
4957

5058
- name: build
5159
run: |
@@ -55,6 +63,8 @@ jobs:
5563
./xbps-src pkg -j4 -m masterdir-${{ matrix.arch }} librewolf
5664
5765
- name: sign
66+
env:
67+
XBPS_PASSPHRASE: ${{ secrets.SIGN_PASS }}
5868
working-directory: void-packages/hostdir/binpkgs/
5969
run: |
6070
export PATH="/opt/xbps/usr/bin/:$PATH"
@@ -75,4 +85,3 @@ jobs:
7585
files: |
7686
void-packages/hostdir/binpkgs/librewolf*
7787
void-packages/hostdir/binpkgs/*repodata
78-

0 commit comments

Comments
 (0)