File tree Expand file tree Collapse file tree 3 files changed +15
-7
lines changed
Expand file tree Collapse file tree 3 files changed +15
-7
lines changed Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ meson --version
2121# Build & Test
2222#
2323mkdir -p build && cd build
24- meson -Ddownload-js=true ..
24+ meson setup -Ddownload-js=true ..
2525ninja -j8
2626
2727# Run tests
Original file line number Diff line number Diff line change 99# This script is *only* intended to be run in a CI container.
1010#
1111
12+ . /etc/os-release
13+
1214# Install dscanner
1315mkdir -p /usr/local/bin/
1416curl -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
2426mkdir /tmp/build/appstream/build
2527cd /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+
4249cd /tmp/build/glib-d/build && \
4350 ninja && ninja install
4451
You can’t perform that action at this time.
0 commit comments