Skip to content

Commit e0e0d55

Browse files
committed
Fix github actions
1 parent e0e0ae8 commit e0e0d55

1 file changed

Lines changed: 37 additions & 38 deletions

File tree

.github/workflows/cmake-multi-platform.yml

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -32,41 +32,40 @@ jobs:
3232
- name: Run build inside Arch Linux container
3333
run: |
3434
docker run --rm \
35-
-v ${{ github.workspace }}:/workspace \
36-
-w /workspace \
37-
archlinux:latest \
38-
bash -c "
39-
set -euxo pipefail
40-
41-
# Setup pacman
42-
pacman-key --init
43-
pacman-key --populate archlinux
44-
pacman -Syu --noconfirm
45-
46-
# Install base-devel, sudo, and other dependencies
47-
pacman -S --noconfirm base-devel sudo git cmake ninja json-c zlib sdbus-cpp qt6 qt6-wayland qt6-webengine layer-shell-qt
48-
49-
# Create a non-root user
50-
useradd -m builduser
51-
echo 'builduser ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
52-
53-
# Switch to non-root user and install yay + uwebsockets
54-
su builduser <<EOF
55-
set -euxo pipefail
56-
cd ~
57-
git clone https://aur.archlinux.org/yay.git
58-
cd yay
59-
makepkg -si --noconfirm
60-
yay -S --noconfirm uwebsockets
61-
EOF
62-
63-
# Back to root, build the project
64-
ldd --version
65-
cmake -B build -G Ninja \
66-
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }} \
67-
-DCMAKE_CXX_COMPILER=${{ matrix.cxx_compiler }} \
68-
-DCMAKE_BUILD_TYPE=Release \
69-
-S .
70-
cmake --build build
71-
ctest --test-dir build
72-
"
35+
-v ${{ github.workspace }}:/workspace \
36+
-w /workspace \
37+
archlinux:latest \
38+
bash -c '
39+
set -euxo pipefail
40+
41+
# Setup pacman
42+
pacman-key --init
43+
pacman-key --populate archlinux
44+
pacman -Syu --noconfirm
45+
46+
# Install base-devel, sudo, and other dependencies
47+
pacman -S --noconfirm base-devel sudo git cmake ninja gtk4 gtk4-layer-shell webkitgtk-6.0 json-c zlib sdbus-cpp qt6 qt6-webengine layer-shell-qt
48+
49+
# Create a non-root user
50+
useradd -m builduser
51+
echo "builduser ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
52+
53+
# Switch to builduser and install yay + uwebsockets
54+
su - builduser <<'"'"'EOF'"'"'
55+
set -euxo pipefail
56+
cd ~
57+
git clone https://aur.archlinux.org/yay.git
58+
cd yay
59+
makepkg -si --noconfirm
60+
yay -S --noconfirm uwebsockets
61+
EOF
62+
63+
# Back to root, build the project
64+
cmake -B build -G Ninja \
65+
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }} \
66+
-DCMAKE_CXX_COMPILER=${{ matrix.cxx_compiler }} \
67+
-DCMAKE_BUILD_TYPE=Release \
68+
-S .
69+
cmake --build build
70+
ctest --test-dir build
71+
'

0 commit comments

Comments
 (0)