Skip to content

Commit f5b50ef

Browse files
committed
[ci] Update CI jobs to build and check webui
1 parent 275c8cf commit f5b50ef

File tree

5 files changed

+21
-41
lines changed

5 files changed

+21
-41
lines changed

.github/workflows/build_htdocs.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

.github/workflows/freebsd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: vmactions/freebsd-vm@v1
2929
with:
3030
prepare: |
31-
pkg install -y gmake autoconf automake libtool pkgconf gettext gperf glib ffmpeg libconfuse libevent libxml2 libgcrypt libunistring libiconv curl libplist libinotify avahi sqlite3 alsa-lib libsodium json-c libwebsockets protobuf-c bison flex
31+
pkg install -y gmake autoconf automake libtool pkgconf gettext gperf glib ffmpeg libconfuse libevent libxml2 libgcrypt libunistring libiconv curl libplist libinotify avahi sqlite3 alsa-lib libsodium json-c libwebsockets protobuf-c bison flex node npm
3232
pw user add owntone -m -d /usr/local/var/cache/owntone
3333
3434
run: |

.github/workflows/ubuntu.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
make
3737
make check
3838
make distcheck
39+
make web-check
3940
4041
- name: Install
4142
run: |

Makefile.am

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ web-update:
120120
$(MAKE) web-update -C web-src
121121
web-serve:
122122
$(MAKE) web-serve -C web-src
123+
web-check:
124+
$(MAKE) web-check -C web-src
123125
web-lint:
124126
$(MAKE) web-lint -C web-src
125127
web-format:

web-src/Makefile.am

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,24 @@ web-serve: node_modules
191191
web-update:
192192
$(if $(NPM),$(NPM) update)
193193

194+
web-check:
195+
@echo "Verifying that all source files in 'src' and 'public' are listed in WEB_FILES ..."
196+
@unexpected_files=0; \
197+
for file in $$(find public src -type f); do \
198+
if ! echo " $(WEB_FILES) " | grep -q " $$file "; then \
199+
echo "Unknown web interface source file found: $$file"; \
200+
unexpected_files=1; \
201+
fi; \
202+
done; \
203+
if [ $$unexpected_files -eq 0 ]; then \
204+
echo "All source files listed in WEB_FILES."; \
205+
else \
206+
echo "FAILURE: Unknown web interface source files found, please add them to WEB_FILES."; \
207+
exit 1; \
208+
fi
209+
194210
web-lint: node_modules
195-
$(if $(NPM),$(NPM) run lint)
211+
$(if $(NPM),$(NPM) run lint --no-fix)
196212

197213
web-format: node_modules
198214
$(if $(NPM),$(NPM) run format)

0 commit comments

Comments
 (0)