Skip to content

Commit d7f108b

Browse files
committed
Refactor workflow
1 parent c963046 commit d7f108b

File tree

1 file changed

+25
-26
lines changed

1 file changed

+25
-26
lines changed

.github/workflows/main.yml

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: enforce-g_malloc
1717
run: "! git grep -P '(?<!g_)malloc' ':!.valgrind.suppressions' ':!.github/workflows/main.yml'"
1818

19-
build:
19+
build-linux:
2020
strategy:
2121
fail-fast: false
2222
matrix:
@@ -67,8 +67,7 @@ jobs:
6767
container:
6868
image: ghcr.io/dunst-project/docker-images:${{ matrix.distro }}
6969

70-
71-
freebsd:
70+
build-freebsd:
7271
runs-on: ubuntu-latest
7372

7473
env:
@@ -85,22 +84,33 @@ jobs:
8584
sync: rsync
8685

8786
prepare: |
88-
pkg install -y x11-toolkits/pango devel/glib20 graphics/gdk-pixbuf2 graphics/cairo graphics/wayland devel/libnotify devel/dbus x11/libXScrnSaver x11/libXrandr x11/libXext x11/libX11 lang/perl5.36 devel/pkgconf devel/gmake devel/evdev-proto
87+
pkg install -y x11-toolkits/pango devel/glib20 graphics/gdk-pixbuf2 graphics/cairo graphics/wayland \
88+
devel/libnotify devel/dbus x11/libXScrnSaver x11/libXrandr x11/libXext x11/libX11 lang/perl5.36 \
89+
devel/pkgconf devel/gmake devel/evdev-proto valgrind
8990
9091
run: |
91-
pwd
92-
ls -lah
93-
whoami
94-
env
95-
freebsd-version
96-
sysctl hw.model
97-
sysctl hw.ncpu
98-
sysctl hw.physmem
99-
sysctl hw.usermem
100-
find / -name 'CHANGELOG.md'
92+
echo "* Run test suite"
93+
gmake -j test
94+
95+
echo "* Run install test"
96+
./test/test-install.sh
97+
98+
echo "* Run valgrind test"
99+
gmake clean && gmake -j test-valgrind
100+
101+
doxygen:
102+
steps:
103+
- uses: actions/checkout@v4
104+
105+
- name: doxygen
106+
run: make -j doc-doxygen
107+
108+
runs-on: ubuntu-latest
109+
container:
110+
image: ghcr.io/dunst-project/docker-images:misc-doxygen
101111

102112
coverage:
103-
needs: build
113+
needs: [build-linux, build-freebsd]
104114
env:
105115
CC: gcc
106116

@@ -133,14 +143,3 @@ jobs:
133143
runs-on: ubuntu-latest
134144
container:
135145
image: ghcr.io/dunst-project/docker-images:fedora
136-
137-
doxygen:
138-
steps:
139-
- uses: actions/checkout@v4
140-
141-
- name: doxygen
142-
run: make -j doc-doxygen
143-
144-
runs-on: ubuntu-latest
145-
container:
146-
image: ghcr.io/dunst-project/docker-images:misc-doxygen

0 commit comments

Comments
 (0)