diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 68f0a60..0461d8d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,10 +24,10 @@ lint:backend: - make backend_lint rules: - changes: - - migrations/**/* - - src/**/* - - Cargo.lock - - Makefile + - migrations/**/* + - src/**/* + - Cargo.lock + - Makefile allow_failure: true #lint:frontend: @@ -63,7 +63,7 @@ build:frontend: - make frontend artifacts: paths: - - ui/dist + - ui/public expire_in: 1 day only: changes: diff --git a/Makefile b/Makefile index 1a58697..6e15516 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ package: target/release/upend ui/dist/index.html rm -fr dist linuxdeploy-x86_64.AppImage --appdir dist cp target/release/upend dist/usr/bin/upend - cp -r ui/dist dist/usr/bin/webui + cp -r ui/public dist/usr/bin/webui cp upend.png dist/usr/share/icons/upend.png VERSION="$$(grep '^version' Cargo.toml|grep -Eo '[0-9]+\.[0-9]+\.[0-9]+')" \ linuxdeploy-x86_64.AppImage --appdir dist -d upend.desktop --output appimage