From 83588aabd283bac54d31b8cd2461e6f9a32d255a Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 22 Sep 2021 21:26:15 +0200 Subject: [PATCH 1/6] chore(gitlab-ci): ... --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b155535a..30983de71 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,6 +42,7 @@ node dependencies: mkdir -p ~/.docker install -v -T -m 0400 "${REGISTRY_AUTHFILE}" ~/.docker/config.json fi + - git status --short --porcelain # debug artifacts: paths: - node-dependencies.nar.xz From 01bdbd1b25c5361690617a5deed0d1ec60cc915c Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 22 Sep 2021 21:29:33 +0200 Subject: [PATCH 2/6] chore(gitlab-ci): ... --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 30983de71..f0deb8a4e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,6 +23,7 @@ stages: node dependencies: stage: frontend:build script: + - git status --short --porcelain # debug - nix -L build -o result .#uniworxNodeDependencies - nix-store --export $(nix-store -qR result) | xz -T0 -2 > node-dependencies.nar.xz before_script: &nix-before @@ -42,7 +43,6 @@ node dependencies: mkdir -p ~/.docker install -v -T -m 0400 "${REGISTRY_AUTHFILE}" ~/.docker/config.json fi - - git status --short --porcelain # debug artifacts: paths: - node-dependencies.nar.xz From 5f7b5cb3805d6c87b1e76b029074f7e2e2b22ec8 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 23 Sep 2021 09:10:39 +0200 Subject: [PATCH 3/6] chore(gitlab-ci): ... --- .gitlab-ci.yml | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f0deb8a4e..181d9556a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,7 @@ default: variables: NIX_PATH: "nixpkgs=http://nixos.org/channels/nixos-21.05/nixexprs.tar.xz" AWS_SHARED_CREDENTIALS_FILE: "/etc/aws/credentials" + FLAKE: "${CI_REPOSITORY_URL}?ref=${CI_COMMIT_SHA}" stages: - frontend:build @@ -23,8 +24,7 @@ stages: node dependencies: stage: frontend:build script: - - git status --short --porcelain # debug - - nix -L build -o result .#uniworxNodeDependencies + - 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 @@ -55,7 +55,7 @@ well known: stage: frontend:build script: - xzcat node-dependencies.nar.xz | nix-store --import - - nix -L build -o result .#uniworxWellKnown + - nix -L build -o result "${FLAKE}#uniworxWellKnown" - nix-store --export $(nix-store -qR result) | xz -T0 -2 > well-known.nar.xz before_script: *nix-before needs: @@ -74,7 +74,7 @@ frontend: script: - xzcat node-dependencies.nar.xz | nix-store --import - xzcat well-known.nar.xz | nix-store --import - - nix -L build -o result .#uniworxFrontend + - nix -L build -o result "${FLAKE}#uniworxFrontend" - nix-store --export $(nix-store -qR result) | xz -T0 -2 > frontend.nar.xz before_script: *nix-before needs: @@ -94,7 +94,7 @@ uniworx:lib:uniworx: stage: backend:build script: - xzcat frontend.nar.xz | nix-store --import - - nix -L build -o result .#uniworx:lib:uniworx + - nix -L build -o result "${FLAKE}#uniworx:lib:uniworx" - nix-store --export $(nix-store -qR result) | xz -T0 -2 > uniworx:lib:uniworx.nar.xz before_script: *nix-before needs: @@ -116,7 +116,7 @@ uniworx:exe:uniworx: stage: backend:build script: - xzcat uniworx:lib:uniworx.nar.xz | nix-store --import - - nix -L build -o result .#uniworx:exe:uniworx + - nix -L build -o result "${FLAKE}#uniworx:exe:uniworx" - nix-store --export $(nix-store -qR result) | xz -T0 -2 > uniworx:exe:uniworx.nar.xz before_script: *nix-before needs: @@ -140,7 +140,7 @@ uniworx:exe:uniworx-wflint: stage: backend:build script: - xzcat uniworx:lib:uniworx.nar.xz | nix-store --import - - nix -L build -o result .#uniworx:exe:uniworx-wflint + - nix -L build -o result "${FLAKE}#uniworx:exe:uniworx-wflint" - nix-store --export $(nix-store -qR result) | xz -T0 -2 > uniworx:exe:uniworx-wflint.nar.xz before_script: *nix-before needs: @@ -164,7 +164,7 @@ uniworx:exe:uniworxdb: stage: backend:build script: - xzcat uniworx:lib:uniworx.nar.xz | nix-store --import - - nix -L build -o result .#uniworx:exe:uniworxdb + - nix -L build -o result "${FLAKE}#uniworx:exe:uniworxdb" - nix-store --export $(nix-store -qR result) | xz -T0 -2 > uniworx:exe:uniworxdb.nar.xz before_script: *nix-before needs: @@ -188,7 +188,7 @@ uniworx:exe:uniworxload: stage: backend:build script: - xzcat uniworx:lib:uniworx.nar.xz | nix-store --import - - nix -L build -o result .#uniworx:exe:uniworxload + - nix -L build -o result "${FLAKE}#uniworx:exe:uniworxload" - nix-store --export $(nix-store -qR result) | xz -T0 -2 > uniworx:exe:uniworxload.nar.xz before_script: *nix-before needs: @@ -232,7 +232,7 @@ demo docker: script: - xzcat uniworx:exe:uniworx.nar.xz | nix-store --import - xzcat uniworx:exe:uniworxdb.nar.xz | nix-store --import - - nix -L build -o result .#uniworxDemoDocker + - nix -L build -o result "${FLAKE}#uniworxDemoDocker" - cp -pr --reflink=auto -L result uniworx-demo.tar.gz before_script: *nix-before needs: @@ -266,7 +266,7 @@ docker: stage: docker script: - xzcat uniworx:exe:uniworx.nar.xz | nix-store --import - - nix -L build -o result .#uniworxDocker + - nix -L build -o result "${FLAKE}#uniworxDocker" - cp -pr --reflink=auto -L result uniworx.tar.gz before_script: *nix-before needs: @@ -305,9 +305,12 @@ parse changelog: before_script: *nix-before script: - xzcat node-dependencies.nar.xz | nix-store --import - - nix -L run .#jqChangelogJson -- -r '.versions[0].version' > .current-version - - nix -L run .#jqChangelogJson -- -r '.versions[0].body' > .current-changelog.md + - nix -L run "${FLAKE}#jqChangelogJson" -- -r '.versions[0].version' > .current-version + - nix -L run "${FLAKE}#jqChangelogJson" -- -r '.versions[0].body' > .current-changelog.md + - echo "VERSION=$(cat .current-version)" >> build.env artifacts: + reports: + dotenv: build.env paths: - .current-version - .current-changelog.md @@ -320,7 +323,7 @@ upload docker: stage: docker script: - xzcat uniworx:exe:uniworx.nar.xz | nix-store --import - - nix -L run .#pushUniworxDocker + - nix -L run "${FLAKE}#pushUniworxDocker" before_script: *nix-before needs: - job: node dependencies # transitive @@ -344,7 +347,7 @@ upload demo docker: script: - xzcat uniworx:exe:uniworx.nar.xz | nix-store --import - xzcat uniworx:exe:uniworxdb.nar.xz | nix-store --import - - nix -L run .#pushUniworxDemoDocker + - nix -L run "${FLAKE}#pushUniworxDemoDocker" before_script: *nix-before needs: - job: node dependencies # transitive @@ -373,8 +376,6 @@ release: rules: - if: $CI_COMMIT_REF_NAME =~ /^v[0-9].*/ when: on_success - before_script: - - export VERSION="$(cat .current-version)" script: - release-cli create --name "${VERSION}" --tag-name $CI_COMMIT_TAG --description .current-changelog.md needs: From ac33c251bc19b843fba6d05a35e1ecf69d748596 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 23 Sep 2021 09:26:55 +0200 Subject: [PATCH 4/6] chore(gitlab-ci): ... --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 181d9556a..74d1695e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ default: variables: NIX_PATH: "nixpkgs=http://nixos.org/channels/nixos-21.05/nixexprs.tar.xz" AWS_SHARED_CREDENTIALS_FILE: "/etc/aws/credentials" - FLAKE: "${CI_REPOSITORY_URL}?ref=${CI_COMMIT_SHA}" + FLAKE: "git+${CI_REPOSITORY_URL}?rev=${CI_COMMIT_SHA}" stages: - frontend:build From f70c2227d132b923fbb20076426e765af32f949f Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 23 Sep 2021 09:30:21 +0200 Subject: [PATCH 5/6] chore(gitlab-ci): ... --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 74d1695e1..fd65cccea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ default: variables: NIX_PATH: "nixpkgs=http://nixos.org/channels/nixos-21.05/nixexprs.tar.xz" AWS_SHARED_CREDENTIALS_FILE: "/etc/aws/credentials" - FLAKE: "git+${CI_REPOSITORY_URL}?rev=${CI_COMMIT_SHA}" + FLAKE: "git+${CI_REPOSITORY_URL}?ref=${CI_COMMIT_REF_NAME}&rev=${CI_COMMIT_SHA}" stages: - frontend:build From 174d77e60d58a8bbcc44091aff0044b91c924802 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 23 Sep 2021 09:33:07 +0200 Subject: [PATCH 6/6] chore(gitlab-ci): ... --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd65cccea..2892f7f24 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,8 @@ variables: NIX_PATH: "nixpkgs=http://nixos.org/channels/nixos-21.05/nixexprs.tar.xz" AWS_SHARED_CREDENTIALS_FILE: "/etc/aws/credentials" FLAKE: "git+${CI_REPOSITORY_URL}?ref=${CI_COMMIT_REF_NAME}&rev=${CI_COMMIT_SHA}" + + TRANSFER_METER_FREQUENCY: "2s" stages: - frontend:build