diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 093e870ae..b2c0aa9b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Gregor Kleen +# SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Gregor Kleen # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -10,14 +10,18 @@ workflow: default: image: - name: registry.uniworx.de/fradrive/fradrive/nix-unstable:0.2.0 + name: registry.uniworx.de/uniworx/containers/nix-attic:latest variables: NIX_PATH: "nixpkgs=http://nixos.org/channels/nixos-21.05/nixexprs.tar.xz" AWS_SHARED_CREDENTIALS_FILE: "/etc/aws/credentials" TRANSFER_METER_FREQUENCY: "2s" - + + NIX_CONFIG: |- + extra-substituters = https://cache.iog.io + extra-trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= + stages: - frontend:build - backend:build @@ -25,7 +29,7 @@ stages: - docker - prepare release - release - + node dependencies: stage: frontend:build script: @@ -33,12 +37,10 @@ node dependencies: - nix -L build -o result "${FLAKE}#uniworxNodeDependencies" - nix-store --export $(nix-store -qR result) | xz -T0 -2 > node-dependencies.nar.xz before_script: &nix-before - - mkdir -p /etc/nix - - install -m 0644 .gitlab-ci/nix.conf /etc/nix/nix.conf - git config --global init.defaultBranch master - install -v -m 0700 -d ~/.ssh - install -v -T -m 0644 "${SSH_KNOWN_HOSTS}" ~/.ssh/known_hosts - - 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 "${NIX_NETRC}" /etc/nix/netrc - | diff --git a/.gitlab-ci/nix-bootstrap.conf b/.gitlab-ci/nix-bootstrap.conf deleted file mode 100644 index 161508eed..000000000 --- a/.gitlab-ci/nix-bootstrap.conf +++ /dev/null @@ -1,5 +0,0 @@ -sandbox = true -experimental-features = nix-command flakes -substituters = https://cache.iog.io https://cache.nixos.org/ -trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= -require-sigs = true \ No newline at end of file diff --git a/.gitlab-ci/nix-bootstrap.conf.license b/.gitlab-ci/nix-bootstrap.conf.license deleted file mode 100644 index 0544bf968..000000000 --- a/.gitlab-ci/nix-bootstrap.conf.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2022 Gregor Kleen - -SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/.gitlab-ci/nix.conf b/.gitlab-ci/nix.conf deleted file mode 100644 index f1fc3be60..000000000 --- a/.gitlab-ci/nix.conf +++ /dev/null @@ -1,2 +0,0 @@ -sandbox = true -experimental-features = nix-command flakes diff --git a/.gitlab-ci/nix.conf.license b/.gitlab-ci/nix.conf.license deleted file mode 100644 index 0544bf968..000000000 --- a/.gitlab-ci/nix.conf.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2022 Gregor Kleen - -SPDX-License-Identifier: AGPL-3.0-or-later