fraport/fradrive-old
fraport/fradrive-old
Archived
3
1
Fork 0
Code Issues 65 Pull Requests 5 Actions Packages Projects Releases 197 Wiki Activity

chore(gitlab-ci): nix shell with gnumake

Browse Source
This commit is contained in:
Sarah Vaupel 2024-01-17 10:34:15 +01:00
parent ee8cbf0e36
commit 4c44aff716
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -50,8 +50,6 @@ node modules:
- install -v -T -m 0400 "${SSH_DEPLOY_KEY}" ~/.ssh/deploy && echo "IdentityFile ~/.ssh/deploy" >> ~/.ssh/config; - install -v -T -m 0400 "${SSH_DEPLOY_KEY}" ~/.ssh/deploy && echo "IdentityFile ~/.ssh/deploy" >> ~/.ssh/config;
- install -v -T -m 0644 "${FONTAWESOME_NPM_AUTH_FILE}" /etc/fontawesome-token - install -v -T -m 0644 "${FONTAWESOME_NPM_AUTH_FILE}" /etc/fontawesome-token
- install -v -T -m 0644 "${NIX_NETRC}" /etc/nix/netrc - install -v -T -m 0644 "${NIX_NETRC}" /etc/nix/netrc
- mkdir -p "$HOME/.config/nix"
- echo 'experimental-features = nix-command flakes' > "$HOME/.config/nix/nix.conf"
artifacts: artifacts:
paths: paths:
- node_modules/ - node_modules/
@ -63,7 +61,7 @@ node modules:
frontend lint: frontend lint:
stage: lint stage: lint
script: script:
- "nix develop --comand 'make frontend-lint'" - "nix shell .#gnumake .#gup .#nodejs_21 --comand 'make frontend-lint'"
before_script: *nix-before before_script: *nix-before
needs: needs:
- job: node modules - job: node modules
@ -79,7 +77,7 @@ frontend build:
paths: paths:
- .well-known-cache - .well-known-cache
script: script:
- "nix develop --command 'make frontend-build'" - "nix shell .#gnumake .#gup .#nodejs_21 --command 'make frontend-build'"
before_script: *nix-before before_script: *nix-before
needs: needs:
- job: node modules - job: node modules

3
flake.nix
View File

@ -107,8 +107,7 @@
(final: prev: let (final: prev: let
pkgs = import nixpkgs { inherit system; }; pkgs = import nixpkgs { inherit system; };
in { in {
inherit (pkgs) gup dockerTools nodejs_21 glibcLocalesUtf8 tzdata exiftools chromium minio minio-client skopeo; inherit (pkgs.stdenv) fetchurlBoot; inherit (pkgs) gup dockerTools nodejs_21 glibcLocalesUtf8 tzdata exiftools chromium minio minio-client skopeo; inherit (pkgs.stdenv) fetchurlBoot make;
make = pkgs.stdenv;
stack = pkgs.symlinkJoin { stack = pkgs.symlinkJoin {
inherit (pkgs.stack) name; inherit (pkgs.stack) name;
paths = [pkgs.stack]; paths = [pkgs.stack];