Skip to content

Commit 80a05b0

Browse files
committed
ci: Improve scripts and don't use deprecated commands
1 parent 9772c26 commit 80a05b0

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

.github/workflows/build-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
run: cd tests/ci/ && podman build -t asgen -f ./Dockerfile-debian-testing .
1818

1919
- name: Build & Test
20+
continue-on-error: ${{ matrix.dc == 'gdc' }}
2021
run: podman run -a stdout -a stderr -e DC=${{ matrix.dc }} -v `pwd`:/build asgen
2122
./tests/ci/build-and-test.sh
2223

tests/ci/build-and-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ meson --version
2121
# Build & Test
2222
#
2323
mkdir -p build && cd build
24-
meson -Ddownload-js=true ..
24+
meson setup -Ddownload-js=true ..
2525
ninja -j8
2626

2727
# Run tests

tests/ci/ci-install-extern.sh

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ set -x
99
# This script is *only* intended to be run in a CI container.
1010
#
1111

12+
. /etc/os-release
13+
1214
# Install dscanner
1315
mkdir -p /usr/local/bin/
1416
curl -L https://github.com/dlang-community/D-Scanner/releases/download/v0.11.0/dscanner-v0.11.0-linux-x86_64.tar.gz -o /tmp/dscanner.tar.gz
@@ -23,7 +25,7 @@ cd /tmp/build && \
2325
git clone --depth=10 https://github.com/ximion/appstream.git
2426
mkdir /tmp/build/appstream/build
2527
cd /tmp/build/appstream/build && \
26-
meson --prefix=/usr \
28+
meson setup --prefix=/usr \
2729
-Dmaintainer=true \
2830
-Dapt-support=true \
2931
-Dcompose=true \
@@ -33,12 +35,17 @@ cd /tmp/build/appstream/build && \
3335
ninja && ninja install
3436

3537
# build & install GLibD
36-
cd /tmp/build && \
37-
git clone --depth=1 https://github.com/gtkd-developers/GlibD.git glib-d
38-
mkdir /tmp/build/glib-d/build
39-
cd /tmp/build/glib-d/build && \
40-
meson --prefix=/usr \
38+
if [ "$ID" = "ubuntu" ]; then
39+
eatmydata apt-get install -yq --no-install-recommends libglibd-2.0-dev
40+
else
41+
cd /tmp/build && \
42+
git clone --depth=1 https://github.com/gtkd-developers/GlibD.git glib-d
43+
mkdir /tmp/build/glib-d/build
44+
cd /tmp/build/glib-d/build && \
45+
meson setup --prefix=/usr \
4146
..
47+
fi;
48+
4249
cd /tmp/build/glib-d/build && \
4350
ninja && ninja install
4451

0 commit comments

Comments
 (0)