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): use nix develop instead of nix-shell

Browse Source
This commit is contained in:
Sarah Vaupel 2024-01-17 09:07:29 +01:00
parent 300955435f
commit 31a192f707
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab-ci.yml
View File

@ -42,8 +42,7 @@ node modules:
- .npm - .npm
- node_modules - node_modules
script: script:
- "nix-shell --version" - "nix develop --command 'make node_modules'"
- "nix-shell --command 'make node_modules'"
before_script: &nix-before before_script: &nix-before
- git config --global init.defaultBranch master - git config --global init.defaultBranch master
- install -v -m 0700 -d ~/.ssh - install -v -m 0700 -d ~/.ssh
@ -64,7 +63,7 @@ node modules:
frontend lint: frontend lint:
stage: lint stage: lint
script: script:
- "nix-shell --comand 'make frontend-lint'" - "nix develop --comand 'make frontend-lint'"
before_script: *nix-before before_script: *nix-before
needs: needs:
- job: node modules - job: node modules
@ -80,7 +79,7 @@ frontend build:
paths: paths:
- .well-known-cache - .well-known-cache
script: script:
- "nix-shell --command 'make frontend-build'" - "nix develop --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

@ -136,9 +136,6 @@
devShell = import ./shell.nix { pkgs = self.legacyPackages.${system}; nixpkgsPath = nixpkgs; }; devShell = import ./shell.nix { pkgs = self.legacyPackages.${system}; nixpkgsPath = nixpkgs; };
legacyPackages = pkgs.lib.foldr (overlay: acc: acc // recursiveUpdate (overlay self.legacyPackages.${system} pkgs) pkgs) {} overlays; legacyPackages = pkgs.lib.foldr (overlay: acc: acc // recursiveUpdate (overlay self.legacyPackages.${system} pkgs) pkgs) {} overlays;
defaultPackage = self.packages.${system}."uniworx:exe:uniworx";
defaultApp = self.apps.${system}."uniworx:exe:uniworx";
} }
); );
} }

2
shell.nix
View File

@ -275,7 +275,7 @@ in pkgs.mkShell {
''; '';
nativeBuildInputs = [develop inDevelop killallUni2work diffRunning] nativeBuildInputs = [develop inDevelop killallUni2work diffRunning]
++ (with pkgs; ++ (with pkgs;
[ (builtins.trace (lib.version) stack) (builtins.trace (lib.version) nodejs_21) postgresql_12 openldap exiftool expat memcached minio minio-client [ stack nodejs_21 postgresql_12 openldap exiftool expat memcached minio minio-client
gnumake gup reuse pre-commit gnumake gup reuse pre-commit
# busybox # for print services, but interferes with build commands in develop-shell # busybox # for print services, but interferes with build commands in develop-shell
htop htop