diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ec77cad7..090c26675 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,40 +57,24 @@ node modules: retry: 2 interruptible: true -well known: - stage: frontend:build - script: - - xzcat node-dependencies.nar.xz | nix-store --import - - nix -L build -o result ".#uniworxWellKnown" - - nix-store --export $(nix-store -qR result) | xz -T0 -2 > well-known.nar.xz - before_script: *nix-before - needs: - - job: node modules - artifacts: true - artifacts: - paths: - - well-known.nar.xz - name: "${CI_JOB_NAME}-${CI_COMMIT_SHORT_SHA}" - expire_in: "1 day" - retry: 2 - interruptible: true - frontend: stage: frontend:build + cache: + - &frontend-cache + key: default-frontend + paths: + - .well-known-cache script: - - xzcat node-dependencies.nar.xz | nix-store --import - - xzcat well-known.nar.xz | nix-store --import - - nix -L build -o result ".#uniworxFrontend" - - nix-store --export $(nix-store -qR result) | xz -T0 -2 > frontend.nar.xz + - make frontend-build before_script: *nix-before needs: - job: node modules artifacts: true - - job: well known - artifacts: true artifacts: paths: - - frontend.nar.xz + - static/ + - well-known/ + - config/webpack.yml name: "${CI_JOB_NAME}-${CI_COMMIT_SHORT_SHA}" expire_in: "1 day" retry: 2 @@ -106,8 +90,6 @@ uniworx:lib:uniworx: needs: - job: node modules # transitive artifacts: false - - job: well known # transitive - artifacts: false - job: frontend artifacts: true artifacts: @@ -128,8 +110,6 @@ uniworx:exe:uniworx: needs: - job: node modules # transitive artifacts: false - - job: well known # transitive - artifacts: false - job: frontend # tranitive artifacts: false - job: uniworx:lib:uniworx @@ -152,8 +132,6 @@ uniworx:exe:uniworxdb: needs: - job: node modules # transitive artifacts: false - - job: well known # transitive - artifacts: false - job: frontend # tranitive artifacts: false - job: uniworx:lib:uniworx @@ -176,8 +154,6 @@ uniworx:exe:uniworxload: needs: - job: node modules # transitive artifacts: false - - job: well known # transitive - artifacts: false - job: frontend # tranitive artifacts: false - job: uniworx:lib:uniworx @@ -200,8 +176,6 @@ check: needs: - job: node modules # transitive artifacts: false - - job: well known # transitive - artifacts: false - job: frontend artifacts: true - job: uniworx:lib:uniworx @@ -218,8 +192,6 @@ container: needs: - job: node modules # transitive artifacts: false - - job: well known # transitive - artifacts: false - job: frontend # tranitive artifacts: false - job: uniworx:lib:uniworx # transitive @@ -246,8 +218,6 @@ test container: needs: - job: node modules # transitive artifacts: false - - job: well known # transitive - artifacts: false - job: frontend # tranitive artifacts: false - job: uniworx:lib:uniworx # transitive @@ -322,8 +292,6 @@ upload container: needs: - job: node modules # transitive artifacts: false - - job: well known # transitive - artifacts: false - job: frontend # tranitive artifacts: false - job: uniworx:lib:uniworx # transitive @@ -349,8 +317,6 @@ upload test container: needs: - job: node modules # transitive artifacts: false - - job: well known # transitive - artifacts: false - job: frontend # tranitive artifacts: false - job: uniworx:lib:uniworx # transitive