diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 976b743..4b55ffd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,7 @@ build-frontend-js: - npm run build artifacts: paths: - - api/static/ + - clippable-svc/static/ build-server-no-admin: extends: .cargo-builder @@ -50,7 +50,7 @@ build-server-no-admin: dependencies: - build-frontend-js script: - - cd api/ + - cd clippable-svc/ - cargo build --release - cd ../ @@ -62,7 +62,7 @@ build-server-admin-enabled: dependencies: - build-frontend-js script: - - cd api/ + - cd clippable-svc/ - cargo build --release --features admin - cd ../ diff --git a/ci/cargo.yml b/ci/cargo.yml index 53205a9..055c5c8 100644 --- a/ci/cargo.yml +++ b/ci/cargo.yml @@ -5,9 +5,9 @@ - master before_script: - mkdir -p build - - cp api/templates/ api/static/ build/ -r + - cp clippable-svc/templates/ clippable-svc/static/ build/ -r after_script: - - cp api/target/release/clippable-server build/server + - cp clippable-svc/target/release/clippable-server build/server - cp ./scripts/ build/ -r - cp readme.md build/ - sh ./scripts/default-rocket-toml.sh diff --git a/scripts/build-all.sh b/scripts/build-all.sh index 1defb8b..706f1e7 100755 --- a/scripts/build-all.sh +++ b/scripts/build-all.sh @@ -10,9 +10,9 @@ cargo build --release mkdir -p build/ -cp target/release/api build/server -cp api/templates/ build/ -r -cp api/static/ build -r +cp target/release/clippable-svc build/server +cp clippable-svc/templates/ build/ -r +cp clippable-svc/static/ build -r bash ./scripts/default-rocket-toml.sh docker build -t registry.gitlab.com/shockrah/clippable .