From f63f38bdaa5df6bf410993de607b34dc75c449fe Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 14 Jul 2023 22:36:30 +0000 Subject: [PATCH 01/27] chore(nix): rename demo docker to test docker and remove additional config and dependencies --- nix/docker/default.nix | 52 ++++------------------------ nix/docker/demo-version.json | 3 -- nix/docker/demo-version.json.license | 3 -- nix/docker/test-version.json | 3 ++ nix/docker/test-version.json.license | 3 ++ 5 files changed, 13 insertions(+), 51 deletions(-) delete mode 100644 nix/docker/demo-version.json delete mode 100644 nix/docker/demo-version.json.license create mode 100644 nix/docker/test-version.json create mode 100644 nix/docker/test-version.json.license diff --git a/nix/docker/default.nix b/nix/docker/default.nix index e488b1b3a..98ec639da 100644 --- a/nix/docker/default.nix +++ b/nix/docker/default.nix @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022-2023 Gregor Kleen , Sarah Vaupel , Steffen Jost +# SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Gregor Kleen , Steffen Jost # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -14,11 +14,11 @@ let ''); in if self ? lastModified then fromDate else "1970-01-01T00:00:01Z"; - mkUniworxDocker = { isDemo }: prev.dockerTools.buildImage { - name = "uniworx${optionalString isDemo "-demo"}"; + mkUniworxDocker = { isTest }: prev.dockerTools.buildImage { + name = "uniworx${optionalString isTest "-test"}"; tag = let - versionFile = if isDemo then ./demo-version.json else ./version.json; + versionFile = if isTest then ./test-version.json else ./version.json; in (builtins.fromJSON (prev.lib.readFile versionFile)).version; inherit created; @@ -44,7 +44,7 @@ let curl wget netcat openldap unixtools.netstat htop gnugrep locale - ] ++ optionals isDemo [ postgresql_12 memcached uniworx.uniworx.components.exes.uniworxdb ]; + ]; runAsRoot = '' #!${final.stdenv.shell} @@ -62,18 +62,6 @@ let # just to see how to create directories here mkdir -p /testdir - - ${optionalString isDemo '' - install -d -g uniworx -o uniworx -m 0750 /var/lib/postgres - - install -d -g uniworx -o uniworx -m 0750 /var/lib/memcached - - install -d -g uniworx -o uniworx -m 0755 /var/log/postgres - install -d -g uniworx -o uniworx -m 0755 /var/log/memcached - - mkdir -p /run - install -d -g uniworx -o uniworx -m 0755 /run/postgres - ''} ''; config = @@ -83,27 +71,6 @@ let cTime=$(date -Is) - ${optionalString isDemo '' - pgDir=/var/lib/postgres - pgSockDir=/run/postgres - pgLogFile=/var/log/postgres/''${cTime}.log - export PGHOST=''${pgSockDir} - export PGLOG=''${pgLogFile} - - pgNew= - if [[ -n "$(find ''${pgDir} -maxdepth 0 -type d -empty 2>/dev/null)" ]]; then - pgNew=1 - fi - - [[ -z "''${pgNew}" ]] || initdb --no-locale --encoding=UTF8 --username postgres --pgdata ''${pgDir} - pg_ctl start -D ''${pgDir} -l ''${pgLogFile} -w -o "-k ''${pgSockDir} -c listen_addresses= -c hba_file=${postgresHba} -c unix_socket_permissions=0777 -c max_connections=9990 -c shared_preload_libraries=pg_stat_statements -c auto_explain.log_min_duration=100ms" - [[ -z "''${pgNew}" ]] || psql -f ${postgresSchema} postgres postgres - - ( cd /var/lib/memcached; memcached -p 11212 ) &>/var/log/memcached/''${cTime}.log & - export SESSION_MEMCACHED_HOST=localhost - export SESSION_MEMCACHED_PORT=11212 - ''} - # export LOGDEST=/var/log/uniworx/''${cTime}.log # kubernetes prefers log via stdout typeset -a configs configs=() @@ -115,9 +82,6 @@ let fi configs+=('${uniworxConfig}') cd /var/lib/uniworx - ${optionalString isDemo '' - [[ -z "''${pgNew}" ]] || uniworxdb -f ''${configs} - ''} exec -- uniworx ''${configs} ''; postgresSchema = prev.writeText "schema.sql" '' @@ -142,13 +106,11 @@ let Volumes = { "/var/lib/uniworx" = {}; "/var/log" = {}; - } // optionalAttrs isDemo { - "/var/lib/postgres" = {}; }; }; }; in mapAttrs (_name: mkUniworxDocker) { - uniworxDemoDocker = { isDemo = true; }; - uniworxDocker = { isDemo = false; }; + uniworxTestDocker = { isTest = true; }; + uniworxDocker = { isTest = false; }; } diff --git a/nix/docker/demo-version.json b/nix/docker/demo-version.json deleted file mode 100644 index fe44f31d2..000000000 --- a/nix/docker/demo-version.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "version": "27.4.13" -} diff --git a/nix/docker/demo-version.json.license b/nix/docker/demo-version.json.license deleted file mode 100644 index a0992def9..000000000 --- a/nix/docker/demo-version.json.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2022 Gregor Kleen ,Steffen Jost - -SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/nix/docker/test-version.json b/nix/docker/test-version.json new file mode 100644 index 000000000..6a3252ea8 --- /dev/null +++ b/nix/docker/test-version.json @@ -0,0 +1,3 @@ +{ + "version": "0.1.0" +} diff --git a/nix/docker/test-version.json.license b/nix/docker/test-version.json.license new file mode 100644 index 000000000..3526b90ae --- /dev/null +++ b/nix/docker/test-version.json.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Gregor Kleen , Steffen Jost + +SPDX-License-Identifier: AGPL-3.0-or-later From 5249abbe20804c3c6a04fb584cb71bb0fe4fb530 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 14 Jul 2023 22:39:34 +0000 Subject: [PATCH 02/27] chore: update flake.nix --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 6c5489232..663a99ec2 100644 --- a/flake.nix +++ b/flake.nix @@ -127,7 +127,7 @@ inherit (pkgs.lib) recursiveUpdate; in { packages = haskellFlake.packages // { - inherit (pkgs) uniworxNodeDependencies uniworxWellKnown uniworxFrontend uniworxDemoDocker uniworxDocker changelogJson; + inherit (pkgs) uniworxNodeDependencies uniworxWellKnown uniworxFrontend uniworxTestDocker uniworxDocker changelogJson; }; apps = haskellFlake.apps // { From bfe9bfda0a12292546a58df113379df3343ef244 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 14 Jul 2023 22:44:52 +0000 Subject: [PATCH 03/27] chore(package.json): reintroduce is-clean check before release --- flake.lock.license | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.lock.license b/flake.lock.license index 0544bf968..b866d6d53 100644 --- a/flake.lock.license +++ b/flake.lock.license @@ -1,3 +1,3 @@ -SPDX-FileCopyrightText: 2022 Gregor Kleen +SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Gregor Kleen SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/package.json b/package.json index 9905d5fcd..399c71cc5 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "frontend:build": "webpack --progress", "frontend:build:watch": "webpack --watch --progress", "i18n:test": "./missing-translations.sh", - "prerelease": "npm run test", + "prerelease": "./is-clean.sh && npm run test", "release": "standard-version -a", "postrelease": "git push --follow-tags origin master", "parse-changelog": "changelog-parser ./CHANGELOG.md > changelog.json" From 0567f438f6ee2ba9425679ce1a5db91540454960 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 14 Jul 2023 22:45:19 +0000 Subject: [PATCH 04/27] chore(is-clean.sh): also allow releases on test branch --- is-clean.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/is-clean.sh b/is-clean.sh index a13382f2b..27625702f 100755 --- a/is-clean.sh +++ b/is-clean.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# SPDX-FileCopyrightText: 2022 Gregor Kleen +# SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Gregor Kleen # # SPDX-License-Identifier: AGPL-3.0-or-later @@ -13,15 +13,17 @@ if [ -n "$(git status --porcelain)" ]; then exit 1 fi -if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then - echo "Not on master" >&2 +branch="$(git rev-parse --abbrev-ref HEAD)" + +if [ $branch != "master" && $branch != "test" ]; then + echo "Not on master or test" >&2 exit 1 fi ourHash=$(git rev-parse HEAD) -theirHash=$(git ls-remote origin -h refs/heads/master | awk '{ print $1; }') +theirHash=$(git ls-remote origin -h refs/heads/$branch | awk '{ print $1; }') if [ "$theirHash" != "$ourHash" ]; then - echo "Local HEAD is not up to date with remote master" >&2 + echo "Local HEAD is not up to date with remote $branch" >&2 exit 1 fi From 6903bc82f836b305db6373b91f79749417ee8c9f Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 14 Jul 2023 22:59:51 +0000 Subject: [PATCH 05/27] chore: conform to reuse spec --- nix/frontend/node-env.nix.license | 3 +++ nix/frontend/node-packages.nix.license | 3 +++ package.json.license | 2 +- package.yaml | 4 ++++ resources/FAG_UKM-MI_Pictogram-Library-Manual_RZ.pdf.license | 3 +++ resources/FraportIcons.zip.license | 3 +++ resources/fraport_icons_übersicht_2018-11-15.pdf.license | 3 +++ src/Model/Types/Lms.hs | 1 + templates/letter/din5008with_pin.latex.license | 3 +++ templates/letter/fraport_f_expiry.md.license | 3 +++ templates/letter/fraport_generic_expiry.md.license | 3 +++ templates/letter/fraport_qualification.md.license | 3 +++ templates/letter/generic_template.html.license | 3 +++ templates/letter/plain_article.latex.license | 3 +++ 14 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 nix/frontend/node-env.nix.license create mode 100644 nix/frontend/node-packages.nix.license create mode 100644 resources/FAG_UKM-MI_Pictogram-Library-Manual_RZ.pdf.license create mode 100644 resources/FraportIcons.zip.license create mode 100644 resources/fraport_icons_übersicht_2018-11-15.pdf.license create mode 100644 templates/letter/din5008with_pin.latex.license create mode 100644 templates/letter/fraport_f_expiry.md.license create mode 100644 templates/letter/fraport_generic_expiry.md.license create mode 100644 templates/letter/fraport_qualification.md.license create mode 100644 templates/letter/generic_template.html.license create mode 100644 templates/letter/plain_article.latex.license diff --git a/nix/frontend/node-env.nix.license b/nix/frontend/node-env.nix.license new file mode 100644 index 000000000..c742b1fc2 --- /dev/null +++ b/nix/frontend/node-env.nix.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Gregor Kleen + +SPDX-LicenseRef: AGPL-3.0-or-later diff --git a/nix/frontend/node-packages.nix.license b/nix/frontend/node-packages.nix.license new file mode 100644 index 000000000..c742b1fc2 --- /dev/null +++ b/nix/frontend/node-packages.nix.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Gregor Kleen + +SPDX-LicenseRef: AGPL-3.0-or-later diff --git a/package.json.license b/package.json.license index 2c711af0d..e71eda12d 100644 --- a/package.json.license +++ b/package.json.license @@ -1,3 +1,3 @@ -SPDX-FileCopyrightText: 2022 Felix Hamann ,Gregor Kleen ,Sarah Vaupel ,Steffen Jost +SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Felix Hamann , Gregor Kleen , Steffen Jost SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/package.yaml b/package.yaml index 4ce8a77e3..c9e1511e3 100644 --- a/package.yaml +++ b/package.yaml @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Gregor Kleen , Steffen Jost +# +# SPDX-License-Identifier: AGPL-3.0-or-later + name: uniworx version: 27.4.13 dependencies: diff --git a/resources/FAG_UKM-MI_Pictogram-Library-Manual_RZ.pdf.license b/resources/FAG_UKM-MI_Pictogram-Library-Manual_RZ.pdf.license new file mode 100644 index 000000000..4055a9e81 --- /dev/null +++ b/resources/FAG_UKM-MI_Pictogram-Library-Manual_RZ.pdf.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2023 Steffen Jost + +SPDX-LicenseRef: Fraport-Corporate-Design diff --git a/resources/FraportIcons.zip.license b/resources/FraportIcons.zip.license new file mode 100644 index 000000000..4055a9e81 --- /dev/null +++ b/resources/FraportIcons.zip.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2023 Steffen Jost + +SPDX-LicenseRef: Fraport-Corporate-Design diff --git a/resources/fraport_icons_übersicht_2018-11-15.pdf.license b/resources/fraport_icons_übersicht_2018-11-15.pdf.license new file mode 100644 index 000000000..4055a9e81 --- /dev/null +++ b/resources/fraport_icons_übersicht_2018-11-15.pdf.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2023 Steffen Jost + +SPDX-LicenseRef: Fraport-Corporate-Design diff --git a/src/Model/Types/Lms.hs b/src/Model/Types/Lms.hs index 85483197b..b965fecd8 100644 --- a/src/Model/Types/Lms.hs +++ b/src/Model/Types/Lms.hs @@ -1,3 +1,4 @@ +-- SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Steffen Jost -- -- SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/templates/letter/din5008with_pin.latex.license b/templates/letter/din5008with_pin.latex.license new file mode 100644 index 000000000..4055a9e81 --- /dev/null +++ b/templates/letter/din5008with_pin.latex.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2023 Steffen Jost + +SPDX-LicenseRef: Fraport-Corporate-Design diff --git a/templates/letter/fraport_f_expiry.md.license b/templates/letter/fraport_f_expiry.md.license new file mode 100644 index 000000000..4055a9e81 --- /dev/null +++ b/templates/letter/fraport_f_expiry.md.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2023 Steffen Jost + +SPDX-LicenseRef: Fraport-Corporate-Design diff --git a/templates/letter/fraport_generic_expiry.md.license b/templates/letter/fraport_generic_expiry.md.license new file mode 100644 index 000000000..4055a9e81 --- /dev/null +++ b/templates/letter/fraport_generic_expiry.md.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2023 Steffen Jost + +SPDX-LicenseRef: Fraport-Corporate-Design diff --git a/templates/letter/fraport_qualification.md.license b/templates/letter/fraport_qualification.md.license new file mode 100644 index 000000000..4055a9e81 --- /dev/null +++ b/templates/letter/fraport_qualification.md.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2023 Steffen Jost + +SPDX-LicenseRef: Fraport-Corporate-Design diff --git a/templates/letter/generic_template.html.license b/templates/letter/generic_template.html.license new file mode 100644 index 000000000..4055a9e81 --- /dev/null +++ b/templates/letter/generic_template.html.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2023 Steffen Jost + +SPDX-LicenseRef: Fraport-Corporate-Design diff --git a/templates/letter/plain_article.latex.license b/templates/letter/plain_article.latex.license new file mode 100644 index 000000000..4055a9e81 --- /dev/null +++ b/templates/letter/plain_article.latex.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2023 Steffen Jost + +SPDX-LicenseRef: Fraport-Corporate-Design From 3646aa8fa54e6f5ffd78f7e1b0ee693963a85b57 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 14 Jul 2023 23:09:02 +0000 Subject: [PATCH 06/27] chore: conform to reuse spec --- nix/frontend/node-env.nix.license | 2 +- nix/frontend/node-packages.nix.license | 2 +- resources/FAG_UKM-MI_Pictogram-Library-Manual_RZ.pdf.license | 2 +- resources/FraportIcons.zip.license | 2 +- resources/fraport_icons_übersicht_2018-11-15.pdf.license | 2 +- templates/letter/din5008with_pin.latex.license | 2 +- templates/letter/fraport_f_expiry.md.license | 2 +- templates/letter/fraport_generic_expiry.md.license | 2 +- templates/letter/fraport_qualification.md.license | 2 +- templates/letter/generic_template.html.license | 2 +- templates/letter/plain_article.latex.license | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/nix/frontend/node-env.nix.license b/nix/frontend/node-env.nix.license index c742b1fc2..0f1e095e5 100644 --- a/nix/frontend/node-env.nix.license +++ b/nix/frontend/node-env.nix.license @@ -1,3 +1,3 @@ SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Gregor Kleen -SPDX-LicenseRef: AGPL-3.0-or-later +SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/nix/frontend/node-packages.nix.license b/nix/frontend/node-packages.nix.license index c742b1fc2..0f1e095e5 100644 --- a/nix/frontend/node-packages.nix.license +++ b/nix/frontend/node-packages.nix.license @@ -1,3 +1,3 @@ SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Gregor Kleen -SPDX-LicenseRef: AGPL-3.0-or-later +SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/resources/FAG_UKM-MI_Pictogram-Library-Manual_RZ.pdf.license b/resources/FAG_UKM-MI_Pictogram-Library-Manual_RZ.pdf.license index 4055a9e81..a13e9edc2 100644 --- a/resources/FAG_UKM-MI_Pictogram-Library-Manual_RZ.pdf.license +++ b/resources/FAG_UKM-MI_Pictogram-Library-Manual_RZ.pdf.license @@ -1,3 +1,3 @@ SPDX-FileCopyrightText: 2023 Steffen Jost -SPDX-LicenseRef: Fraport-Corporate-Design +SPDX-License-Identifier: LicenseRef-Fraport-Corporate-Design diff --git a/resources/FraportIcons.zip.license b/resources/FraportIcons.zip.license index 4055a9e81..a13e9edc2 100644 --- a/resources/FraportIcons.zip.license +++ b/resources/FraportIcons.zip.license @@ -1,3 +1,3 @@ SPDX-FileCopyrightText: 2023 Steffen Jost -SPDX-LicenseRef: Fraport-Corporate-Design +SPDX-License-Identifier: LicenseRef-Fraport-Corporate-Design diff --git a/resources/fraport_icons_übersicht_2018-11-15.pdf.license b/resources/fraport_icons_übersicht_2018-11-15.pdf.license index 4055a9e81..a13e9edc2 100644 --- a/resources/fraport_icons_übersicht_2018-11-15.pdf.license +++ b/resources/fraport_icons_übersicht_2018-11-15.pdf.license @@ -1,3 +1,3 @@ SPDX-FileCopyrightText: 2023 Steffen Jost -SPDX-LicenseRef: Fraport-Corporate-Design +SPDX-License-Identifier: LicenseRef-Fraport-Corporate-Design diff --git a/templates/letter/din5008with_pin.latex.license b/templates/letter/din5008with_pin.latex.license index 4055a9e81..a13e9edc2 100644 --- a/templates/letter/din5008with_pin.latex.license +++ b/templates/letter/din5008with_pin.latex.license @@ -1,3 +1,3 @@ SPDX-FileCopyrightText: 2023 Steffen Jost -SPDX-LicenseRef: Fraport-Corporate-Design +SPDX-License-Identifier: LicenseRef-Fraport-Corporate-Design diff --git a/templates/letter/fraport_f_expiry.md.license b/templates/letter/fraport_f_expiry.md.license index 4055a9e81..a13e9edc2 100644 --- a/templates/letter/fraport_f_expiry.md.license +++ b/templates/letter/fraport_f_expiry.md.license @@ -1,3 +1,3 @@ SPDX-FileCopyrightText: 2023 Steffen Jost -SPDX-LicenseRef: Fraport-Corporate-Design +SPDX-License-Identifier: LicenseRef-Fraport-Corporate-Design diff --git a/templates/letter/fraport_generic_expiry.md.license b/templates/letter/fraport_generic_expiry.md.license index 4055a9e81..a13e9edc2 100644 --- a/templates/letter/fraport_generic_expiry.md.license +++ b/templates/letter/fraport_generic_expiry.md.license @@ -1,3 +1,3 @@ SPDX-FileCopyrightText: 2023 Steffen Jost -SPDX-LicenseRef: Fraport-Corporate-Design +SPDX-License-Identifier: LicenseRef-Fraport-Corporate-Design diff --git a/templates/letter/fraport_qualification.md.license b/templates/letter/fraport_qualification.md.license index 4055a9e81..a13e9edc2 100644 --- a/templates/letter/fraport_qualification.md.license +++ b/templates/letter/fraport_qualification.md.license @@ -1,3 +1,3 @@ SPDX-FileCopyrightText: 2023 Steffen Jost -SPDX-LicenseRef: Fraport-Corporate-Design +SPDX-License-Identifier: LicenseRef-Fraport-Corporate-Design diff --git a/templates/letter/generic_template.html.license b/templates/letter/generic_template.html.license index 4055a9e81..a13e9edc2 100644 --- a/templates/letter/generic_template.html.license +++ b/templates/letter/generic_template.html.license @@ -1,3 +1,3 @@ SPDX-FileCopyrightText: 2023 Steffen Jost -SPDX-LicenseRef: Fraport-Corporate-Design +SPDX-License-Identifier: LicenseRef-Fraport-Corporate-Design diff --git a/templates/letter/plain_article.latex.license b/templates/letter/plain_article.latex.license index 4055a9e81..a13e9edc2 100644 --- a/templates/letter/plain_article.latex.license +++ b/templates/letter/plain_article.latex.license @@ -1,3 +1,3 @@ SPDX-FileCopyrightText: 2023 Steffen Jost -SPDX-LicenseRef: Fraport-Corporate-Design +SPDX-License-Identifier: LicenseRef-Fraport-Corporate-Design From 289ce8acf894bff7e11721f826a267a4033b4efb Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 14 Jul 2023 23:36:42 +0000 Subject: [PATCH 07/27] chore(gitlab-ci): add test container job --- .gitlab-ci.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c630c71e3..06bb69de4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -240,6 +240,36 @@ container: rules: &release-rules - if: $CI_COMMIT_TAG =~ /^v/ +test container: + stage: container:build + script: + - xzcat uniworx:exe:uniworx.nar.xz | nix-store --import + - source .gitlab-ci/construct-flake-url.sh + - cp -pr --reflink=auto -L $(nix build --print-out-paths "${FLAKE}#uniworxTestDocker") uniworx.tar.gz + before_script: *nix-before + needs: + - job: node dependencies # transitive + artifacts: false + - job: well known # transitive + artifacts: false + - job: frontend # tranitive + artifacts: false + - job: uniworx:lib:uniworx # transitive + artifacts: false + - job: uniworx:exe:uniworx + artifacts: true + - job: check # sanity + artifacts: false + artifacts: + paths: + - uniworx.tar.gz + name: "${CI_JOB_NAME}-${CI_COMMIT_SHORT_SHA}" + expire_in: "1 day" + retry: 2 + interruptible: true + rules: &test-release-rules + - if: $CI_COMMIT_TAG =~ /^v/ && $CI_COMMIT_BRANCH == "test" + parse changelog: stage: prepare release needs: From 16a1c1effe10d6f5fec43429a561adf564d9722c Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 14 Jul 2023 23:38:22 +0000 Subject: [PATCH 08/27] chore(is-clean.sh): fix branch check --- is-clean.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/is-clean.sh b/is-clean.sh index 27625702f..b50600b68 100755 --- a/is-clean.sh +++ b/is-clean.sh @@ -15,7 +15,7 @@ fi branch="$(git rev-parse --abbrev-ref HEAD)" -if [ $branch != "master" && $branch != "test" ]; then +if [[ $branch != "master" && $branch != "test" ]]; then echo "Not on master or test" >&2 exit 1 fi From 9b9e892612cade47f6fd437876f525781232bb6b Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sat, 15 Jul 2023 02:56:45 +0000 Subject: [PATCH 09/27] chore(release): 27.4.14 --- CHANGELOG.md | 7 +++++++ nix/docker/version.json | 2 +- package-lock.json | 2 +- package.json | 2 +- package.yaml | 6 +----- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b5eebd6c..ac515e1e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [27.4.14](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.13...v27.4.14) (2023-07-15) + + +### Bug Fixes + +* **avs:** eliminate call to undefined in Esqueleto.Internals ([240c6f8](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/240c6f81f81d1872317da01411fa67ec97e3b16d)) + ## [27.4.13](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.12...v27.4.13) (2023-07-12) diff --git a/nix/docker/version.json b/nix/docker/version.json index fe44f31d2..82f0bdba7 100644 --- a/nix/docker/version.json +++ b/nix/docker/version.json @@ -1,3 +1,3 @@ { - "version": "27.4.13" + "version": "27.4.14" } diff --git a/package-lock.json b/package-lock.json index 1573d51d9..e9fdffe9a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.13", + "version": "27.4.14", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 399c71cc5..142eff3e2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.13", + "version": "27.4.14", "description": "", "keywords": [], "author": "", diff --git a/package.yaml b/package.yaml index c9e1511e3..cfe01b928 100644 --- a/package.yaml +++ b/package.yaml @@ -1,9 +1,5 @@ -# SPDX-FileCopyrightText: 2022-2023 Sarah Vaupel , Gregor Kleen , Steffen Jost -# -# SPDX-License-Identifier: AGPL-3.0-or-later - name: uniworx -version: 27.4.13 +version: 27.4.14 dependencies: - base - yesod From 0c1e1d934f8b20eb5f581e76267dd38cc6489baf Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sat, 15 Jul 2023 11:43:08 +0000 Subject: [PATCH 10/27] chore(gitlab-ci): add test branch to workflow rules --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06bb69de4..858a574e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,7 @@ workflow: rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == "test" - if: $CI_MERGE_REQUEST_ID - if: $CI_COMMIT_TAG =~ /^v/ From fbf58f5aec29563a6656d7a1e89056b63d6eb7cf Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sat, 15 Jul 2023 11:51:34 +0000 Subject: [PATCH 11/27] chore(gitlab-ci): upload test container --- .gitlab-ci.yml | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 858a574e5..891c97f2e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -240,7 +240,6 @@ container: interruptible: true rules: &release-rules - if: $CI_COMMIT_TAG =~ /^v/ - test container: stage: container:build script: @@ -322,6 +321,33 @@ upload container: artifacts: false rules: *release-rules retry: 2 +upload test container: + variables: + GIT_STRATEGY: none + stage: release + image: quay.io/skopeo/stable:latest + script: + - skopeo --insecure-policy copy --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker-archive://$(pwd)/uniworx.tar.gz docker://${CI_REGISTRY_IMAGE}:${VERSION} + - skopeo --insecure-policy copy --src-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker://${CI_REGISTRY_IMAGE}:${VERSION} docker://${CI_REGISTRY_IMAGE}:latest + needs: + - job: node dependencies # transitive + artifacts: false + - job: well known # transitive + artifacts: false + - job: frontend # tranitive + artifacts: false + - job: uniworx:lib:uniworx # transitive + artifacts: false + - job: uniworx:exe:uniworx # transitive + artifacts: false + - job: test container + artifacts: true + - job: parse changelog + artifacts: true + - job: check # sanity + artifacts: false + rules: *test-release-rules + retry: 2 release: variables: From 904f07a0b6a1fb28980ae803378cff06bbf569d3 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sat, 15 Jul 2023 12:00:44 +0000 Subject: [PATCH 12/27] chore(gitlab-ci): test release --- .gitlab-ci.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 891c97f2e..d84a45673 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -239,7 +239,7 @@ container: retry: 2 interruptible: true rules: &release-rules - - if: $CI_COMMIT_TAG =~ /^v/ + - if: $CI_COMMIT_TAG =~ /^v/ && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH test container: stage: container:build script: @@ -366,3 +366,20 @@ release: artifacts: false - job: parse changelog artifacts: true +test release: + variables: + GIT_STRATEGY: none + stage: release + image: registry.gitlab.com/gitlab-org/release-cli:latest + rules: *test-release-rules + script: + - echo "Will create test release ${VERSION}..." + release: + name: "${VERSION}-test" + tag_name: "${CI_COMMIT_TAG}-test" + description: .current-changelog.md + needs: + - job: check # sanity + artifacts: false + - job: parse changelog + artifacts: true From 1254e95fcef4b293a4d49c5880aad0d235d457f7 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sat, 15 Jul 2023 12:13:22 +0000 Subject: [PATCH 13/27] chore(gitlab-ci): separate release-test command and tags --- .gitlab-ci.yml | 6 +++--- package.json | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d84a45673..e3ee418ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -239,7 +239,7 @@ container: retry: 2 interruptible: true rules: &release-rules - - if: $CI_COMMIT_TAG =~ /^v/ && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_TAG =~ /^v/ test container: stage: container:build script: @@ -268,7 +268,7 @@ test container: retry: 2 interruptible: true rules: &test-release-rules - - if: $CI_COMMIT_TAG =~ /^v/ && $CI_COMMIT_BRANCH == "test" + - if: $CI_COMMIT_TAG =~ /^t/ parse changelog: stage: prepare release @@ -376,7 +376,7 @@ test release: - echo "Will create test release ${VERSION}..." release: name: "${VERSION}-test" - tag_name: "${CI_COMMIT_TAG}-test" + tag_name: '$CI_COMMIT_TAG' description: .current-changelog.md needs: - job: check # sanity diff --git a/package.json b/package.json index 142eff3e2..287e6a25b 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "i18n:test": "./missing-translations.sh", "prerelease": "./is-clean.sh && npm run test", "release": "standard-version -a", + "release-test": "standard-version -a -t t", "postrelease": "git push --follow-tags origin master", "parse-changelog": "changelog-parser ./CHANGELOG.md > changelog.json" }, From dc1460047863bdd7954c423e3a71158f1384eb4f Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sat, 15 Jul 2023 12:16:06 +0000 Subject: [PATCH 14/27] chore(gitlab-ci): update workflow rules --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e3ee418ba..104d94901 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,9 +5,9 @@ workflow: rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - - if: $CI_COMMIT_BRANCH == "test" - if: $CI_MERGE_REQUEST_ID - if: $CI_COMMIT_TAG =~ /^v/ + - if: $CI_COMMIT_TAG =~ /^t/ default: image: @@ -373,7 +373,7 @@ test release: image: registry.gitlab.com/gitlab-org/release-cli:latest rules: *test-release-rules script: - - echo "Will create test release ${VERSION}..." + - echo "Will create test release ${VERSION}-test..." release: name: "${VERSION}-test" tag_name: '$CI_COMMIT_TAG' From ccfe440530d5ac32383009dfb201f5e2c3029e50 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sat, 15 Jul 2023 12:20:25 +0000 Subject: [PATCH 15/27] chore(gitlab-ci): use separate parse test changelog --- .gitlab-ci.yml | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 104d94901..8ca97040f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -293,6 +293,29 @@ parse changelog: expire_in: "1 day" retry: 2 interruptible: true +parse test changelog: + stage: prepare release + needs: + - job: node dependencies + artifacts: true + rules: *test-release-rules + before_script: *nix-before + script: + - xzcat node-dependencies.nar.xz | nix-store --import + - source .gitlab-ci/construct-flake-url.sh + - 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 + name: "changelog-${CI_COMMIT_SHORT_SHA}" + expire_in: "1 day" + retry: 2 + interruptible: true upload container: variables: @@ -342,7 +365,7 @@ upload test container: artifacts: false - job: test container artifacts: true - - job: parse changelog + - job: parse test changelog artifacts: true - job: check # sanity artifacts: false @@ -381,5 +404,5 @@ test release: needs: - job: check # sanity artifacts: false - - job: parse changelog + - job: parse test changelog artifacts: true From c8a3625e319d12c5788ca090f79481b0faa76f25 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sat, 15 Jul 2023 15:52:33 +0000 Subject: [PATCH 16/27] chore(gitlab-ci): change test container destiny --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8ca97040f..4122e4001 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -350,8 +350,8 @@ upload test container: stage: release image: quay.io/skopeo/stable:latest script: - - skopeo --insecure-policy copy --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker-archive://$(pwd)/uniworx.tar.gz docker://${CI_REGISTRY_IMAGE}:${VERSION} - - skopeo --insecure-policy copy --src-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker://${CI_REGISTRY_IMAGE}:${VERSION} docker://${CI_REGISTRY_IMAGE}:latest + - skopeo --insecure-policy copy --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker-archive://$(pwd)/uniworx.tar.gz docker://test/${CI_REGISTRY_IMAGE}:${VERSION} + - skopeo --insecure-policy copy --src-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker://test/${CI_REGISTRY_IMAGE}:${VERSION} docker://test/${CI_REGISTRY_IMAGE}:latest needs: - job: node dependencies # transitive artifacts: false From 1e74770ea2ac83177a51a0ac894d26c172a212cf Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sat, 15 Jul 2023 16:24:19 +0000 Subject: [PATCH 17/27] chore(gitlab-ci): use flake.nix instead of manually constructing flake url --- .gitlab-ci.yml | 40 +++++++++++-------------------- .gitlab-ci/construct-flake-url.sh | 12 ---------- 2 files changed, 14 insertions(+), 38 deletions(-) delete mode 100755 .gitlab-ci/construct-flake-url.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4122e4001..e505066d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,8 +34,7 @@ stages: node dependencies: stage: frontend:build script: - - source .gitlab-ci/construct-flake-url.sh - - nix -L build -o result "${FLAKE}#uniworxNodeDependencies" + - nix -L build -o result ".#uniworxNodeDependencies" - nix-store --export $(nix-store -qR result) | xz -T0 -2 > node-dependencies.nar.xz before_script: &nix-before - git config --global init.defaultBranch master @@ -56,8 +55,7 @@ well known: stage: frontend:build script: - xzcat node-dependencies.nar.xz | nix-store --import - - source .gitlab-ci/construct-flake-url.sh - - nix -L build -o result "${FLAKE}#uniworxWellKnown" + - 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: @@ -76,8 +74,7 @@ frontend: script: - xzcat node-dependencies.nar.xz | nix-store --import - xzcat well-known.nar.xz | nix-store --import - - source .gitlab-ci/construct-flake-url.sh - - nix -L build -o result "${FLAKE}#uniworxFrontend" + - nix -L build -o result ".#uniworxFrontend" - nix-store --export $(nix-store -qR result) | xz -T0 -2 > frontend.nar.xz before_script: *nix-before needs: @@ -97,8 +94,7 @@ uniworx:lib:uniworx: stage: backend:build script: - xzcat frontend.nar.xz | nix-store --import - - source .gitlab-ci/construct-flake-url.sh - - nix -L build -o result "${FLAKE}#uniworx:lib:uniworx" + - nix -L build -o result ".#uniworx:lib:uniworx" - nix-store --export $(nix-store -qR result) | xz -T0 -2 > uniworx:lib:uniworx.nar.xz before_script: *nix-before needs: @@ -120,8 +116,7 @@ uniworx:exe:uniworx: stage: backend:build script: - xzcat uniworx:lib:uniworx.nar.xz | nix-store --import - - source .gitlab-ci/construct-flake-url.sh - - nix -L build -o result "${FLAKE}#uniworx:exe:uniworx" + - nix -L build -o result ".#uniworx:exe:uniworx" - nix-store --export $(nix-store -qR result) | xz -T0 -2 > uniworx:exe:uniworx.nar.xz before_script: *nix-before needs: @@ -145,8 +140,7 @@ uniworx:exe:uniworxdb: stage: backend:build script: - xzcat uniworx:lib:uniworx.nar.xz | nix-store --import - - source .gitlab-ci/construct-flake-url.sh - - nix -L build -o result "${FLAKE}#uniworx:exe:uniworxdb" + - nix -L build -o result ".#uniworx:exe:uniworxdb" - nix-store --export $(nix-store -qR result) | xz -T0 -2 > uniworx:exe:uniworxdb.nar.xz before_script: *nix-before needs: @@ -170,8 +164,7 @@ uniworx:exe:uniworxload: stage: backend:build script: - xzcat uniworx:lib:uniworx.nar.xz | nix-store --import - - source .gitlab-ci/construct-flake-url.sh - - nix -L build -o result "${FLAKE}#uniworx:exe:uniworxload" + - nix -L build -o result ".#uniworx:exe:uniworxload" - nix-store --export $(nix-store -qR result) | xz -T0 -2 > uniworx:exe:uniworxload.nar.xz before_script: *nix-before needs: @@ -196,8 +189,7 @@ check: script: - xzcat frontend.nar.xz | nix-store --import - xzcat uniworx:lib:uniworx.nar.xz | nix-store --import - - source .gitlab-ci/construct-flake-url.sh - - nix -L flake check ${FLAKE} + - nix -L flake check . before_script: *nix-before needs: - job: node dependencies # transitive @@ -215,8 +207,7 @@ container: stage: container:build script: - xzcat uniworx:exe:uniworx.nar.xz | nix-store --import - - source .gitlab-ci/construct-flake-url.sh - - cp -pr --reflink=auto -L $(nix build --print-out-paths "${FLAKE}#uniworxDocker") uniworx.tar.gz + - cp -pr --reflink=auto -L $(nix build --print-out-paths ".#uniworxDocker") uniworx.tar.gz before_script: *nix-before needs: - job: node dependencies # transitive @@ -244,8 +235,7 @@ test container: stage: container:build script: - xzcat uniworx:exe:uniworx.nar.xz | nix-store --import - - source .gitlab-ci/construct-flake-url.sh - - cp -pr --reflink=auto -L $(nix build --print-out-paths "${FLAKE}#uniworxTestDocker") uniworx.tar.gz + - cp -pr --reflink=auto -L $(nix build --print-out-paths ".#uniworxTestDocker") uniworx.tar.gz before_script: *nix-before needs: - job: node dependencies # transitive @@ -279,9 +269,8 @@ parse changelog: before_script: *nix-before script: - xzcat node-dependencies.nar.xz | nix-store --import - - source .gitlab-ci/construct-flake-url.sh - - nix -L run "${FLAKE}#jqChangelogJson" -- -r '.versions[0].version' > .current-version - - nix -L run "${FLAKE}#jqChangelogJson" -- -r '.versions[0].body' > .current-changelog.md + - nix -L run ".#jqChangelogJson" -- -r '.versions[0].version' > .current-version + - nix -L run ".#jqChangelogJson" -- -r '.versions[0].body' > .current-changelog.md - echo "VERSION=$(cat .current-version)" >> build.env artifacts: reports: @@ -302,9 +291,8 @@ parse test changelog: before_script: *nix-before script: - xzcat node-dependencies.nar.xz | nix-store --import - - source .gitlab-ci/construct-flake-url.sh - - nix -L run "${FLAKE}#jqChangelogJson" -- -r '.versions[0].version' > .current-version - - nix -L run "${FLAKE}#jqChangelogJson" -- -r '.versions[0].body' > .current-changelog.md + - nix -L run ".#jqChangelogJson" -- -r '.versions[0].version' > .current-version + - nix -L run ".#jqChangelogJson" -- -r '.versions[0].body' > .current-changelog.md - echo "VERSION=$(cat .current-version)" >> build.env artifacts: reports: diff --git a/.gitlab-ci/construct-flake-url.sh b/.gitlab-ci/construct-flake-url.sh deleted file mode 100755 index 18802d34c..000000000 --- a/.gitlab-ci/construct-flake-url.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# SPDX-FileCopyrightText: 2022 Gregor Kleen -# -# SPDX-License-Identifier: AGPL-3.0-or-later - -if [ -n "${CI_COMMIT_TAG}" ]; then - ref="refs/tags/${CI_COMMIT_TAG}" -else - ref="refs/heads/${CI_COMMIT_BRANCH}" -fi -export FLAKE="git+${CI_REPOSITORY_URL}?rev=${CI_COMMIT_SHA}&ref=${ref}" From d0e45ff2f15775a7edf645cb5704884f621af28b Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sun, 16 Jul 2023 14:51:19 +0000 Subject: [PATCH 18/27] chore(npm): use release script for determining version tag prefix --- package.json | 3 +-- release.sh | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100755 release.sh diff --git a/package.json b/package.json index 287e6a25b..8ab5736b3 100644 --- a/package.json +++ b/package.json @@ -24,8 +24,7 @@ "frontend:build:watch": "webpack --watch --progress", "i18n:test": "./missing-translations.sh", "prerelease": "./is-clean.sh && npm run test", - "release": "standard-version -a", - "release-test": "standard-version -a -t t", + "release": "./release.sh", "postrelease": "git push --follow-tags origin master", "parse-changelog": "changelog-parser ./CHANGELOG.md > changelog.json" }, diff --git a/release.sh b/release.sh new file mode 100755 index 000000000..80b2f17f0 --- /dev/null +++ b/release.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# SPDX-FileCopyrightText: 2023 Sarah Vaupel +# +# SPDX-License-Identifier: AGPL-3.0-or-later + +set -e + +case "$(git rev-parse --abbrev-ref HEAD)" in + "master" | "main") + standard-version -a + ;; + "test") + standard-version -a -t t + ;; + *) + echo "Current branch not supported for release!" + exit 1 + ;; +esac From d1738c296312c03c5b88abc113ceb0d7fa400119 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sun, 16 Jul 2023 14:52:11 +0000 Subject: [PATCH 19/27] chore(release): 27.4.15 --- CHANGELOG.md | 2 ++ nix/docker/version.json | 2 +- package-lock.json | 2 +- package.json | 2 +- package.yaml | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac515e1e5..74bf79a88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [27.4.15](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/t0.4.0...t27.4.15) (2023-07-16) + ## [27.4.14](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.13...v27.4.14) (2023-07-15) diff --git a/nix/docker/version.json b/nix/docker/version.json index 82f0bdba7..702413be4 100644 --- a/nix/docker/version.json +++ b/nix/docker/version.json @@ -1,3 +1,3 @@ { - "version": "27.4.14" + "version": "27.4.15" } diff --git a/package-lock.json b/package-lock.json index e9fdffe9a..31c0f358e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.14", + "version": "27.4.15", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 8ab5736b3..05490581e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.14", + "version": "27.4.15", "description": "", "keywords": [], "author": "", diff --git a/package.yaml b/package.yaml index cfe01b928..fa0e1fa2c 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: uniworx -version: 27.4.14 +version: 27.4.15 dependencies: - base - yesod From 94865d15811e1e790d88c7ec621a56ebeecd535a Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sun, 16 Jul 2023 14:55:52 +0000 Subject: [PATCH 20/27] chore(release): use current origin instead of master --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 05490581e..32fa8988b 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "i18n:test": "./missing-translations.sh", "prerelease": "./is-clean.sh && npm run test", "release": "./release.sh", - "postrelease": "git push --follow-tags origin master", + "postrelease": "git push --follow-tags", "parse-changelog": "changelog-parser ./CHANGELOG.md > changelog.json" }, "husky": { From b53166f75e7e2f644fc3be351b9cca287b30abe5 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sun, 16 Jul 2023 14:56:09 +0000 Subject: [PATCH 21/27] chore(release): 27.4.16 --- CHANGELOG.md | 2 ++ nix/docker/version.json | 2 +- package-lock.json | 2 +- package.json | 2 +- package.yaml | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74bf79a88..912517e26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [27.4.16](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/t27.4.15...t27.4.16) (2023-07-16) + ## [27.4.15](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/t0.4.0...t27.4.15) (2023-07-16) ## [27.4.14](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v27.4.13...v27.4.14) (2023-07-15) diff --git a/nix/docker/version.json b/nix/docker/version.json index 702413be4..2916072c2 100644 --- a/nix/docker/version.json +++ b/nix/docker/version.json @@ -1,3 +1,3 @@ { - "version": "27.4.15" + "version": "27.4.16" } diff --git a/package-lock.json b/package-lock.json index 31c0f358e..a2e75586b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.15", + "version": "27.4.16", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 32fa8988b..f5ff03649 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.15", + "version": "27.4.16", "description": "", "keywords": [], "author": "", diff --git a/package.yaml b/package.yaml index fa0e1fa2c..3ff2e97f1 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: uniworx -version: 27.4.15 +version: 27.4.16 dependencies: - base - yesod From bca7afe92d1415a90d4875c2c2041434f8a9a774 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sun, 16 Jul 2023 19:06:44 +0000 Subject: [PATCH 22/27] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e505066d0..d98f76d1c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -339,7 +339,7 @@ upload test container: image: quay.io/skopeo/stable:latest script: - skopeo --insecure-policy copy --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker-archive://$(pwd)/uniworx.tar.gz docker://test/${CI_REGISTRY_IMAGE}:${VERSION} - - skopeo --insecure-policy copy --src-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker://test/${CI_REGISTRY_IMAGE}:${VERSION} docker://test/${CI_REGISTRY_IMAGE}:latest + - skopeo --insecure-policy copy --src-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker://${CI_REGISTRY}/fradrive/test:${VERSION} docker://${CI_REGISTRY}/fradrive/test:latest needs: - job: node dependencies # transitive artifacts: false From 53b2d37478cd559d89bca83c2dbd9bde965608ed Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sun, 16 Jul 2023 19:07:24 +0000 Subject: [PATCH 23/27] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d98f76d1c..ae4970080 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -339,7 +339,7 @@ upload test container: image: quay.io/skopeo/stable:latest script: - skopeo --insecure-policy copy --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker-archive://$(pwd)/uniworx.tar.gz docker://test/${CI_REGISTRY_IMAGE}:${VERSION} - - skopeo --insecure-policy copy --src-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker://${CI_REGISTRY}/fradrive/test:${VERSION} docker://${CI_REGISTRY}/fradrive/test:latest + - skopeo --insecure-policy copy --src-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker://${CI_REGISTRY}/fradrive/fradrive/test:${VERSION} docker://${CI_REGISTRY}/fradrive/fradrive/test:latest needs: - job: node dependencies # transitive artifacts: false From f60d8dddc71ad2618fb706649bc275b51b726c4c Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sun, 16 Jul 2023 19:09:15 +0000 Subject: [PATCH 24/27] chore(release): 27.4.17 --- CHANGELOG.md | 2 ++ nix/docker/version.json | 2 +- package-lock.json | 2 +- package.json | 2 +- package.yaml | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 912517e26..14c9eadf3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [27.4.17](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/t27.4.16...t27.4.17) (2023-07-16) + ## [27.4.16](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/t27.4.15...t27.4.16) (2023-07-16) ## [27.4.15](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/t0.4.0...t27.4.15) (2023-07-16) diff --git a/nix/docker/version.json b/nix/docker/version.json index 2916072c2..2c857ea0a 100644 --- a/nix/docker/version.json +++ b/nix/docker/version.json @@ -1,3 +1,3 @@ { - "version": "27.4.16" + "version": "27.4.17" } diff --git a/package-lock.json b/package-lock.json index a2e75586b..70d7a6681 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.16", + "version": "27.4.17", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f5ff03649..b563866f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.16", + "version": "27.4.17", "description": "", "keywords": [], "author": "", diff --git a/package.yaml b/package.yaml index 3ff2e97f1..32c5abf02 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: uniworx -version: 27.4.16 +version: 27.4.17 dependencies: - base - yesod From 993be351e2bba66f324dfd8b5e4a794f2f985b40 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sun, 16 Jul 2023 19:18:47 +0000 Subject: [PATCH 25/27] chore(gitlab-ci): use CI_COMMIT_REF_NAME --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae4970080..7bf624a52 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -339,7 +339,7 @@ upload test container: image: quay.io/skopeo/stable:latest script: - skopeo --insecure-policy copy --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker-archive://$(pwd)/uniworx.tar.gz docker://test/${CI_REGISTRY_IMAGE}:${VERSION} - - skopeo --insecure-policy copy --src-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker://${CI_REGISTRY}/fradrive/fradrive/test:${VERSION} docker://${CI_REGISTRY}/fradrive/fradrive/test:latest + - skopeo --insecure-policy copy --src-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker://${CI_REGISTRY}/fradrive/fradrive/test:${CI_COMMIT_REF_NAME} docker://${CI_REGISTRY}/fradrive/fradrive/test:latest needs: - job: node dependencies # transitive artifacts: false From 0bfe34b61efaeb0d619e4c84a5c51f645260292e Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sun, 16 Jul 2023 19:19:03 +0000 Subject: [PATCH 26/27] chore(release): 27.4.18 --- CHANGELOG.md | 2 ++ nix/docker/version.json | 2 +- package-lock.json | 2 +- package.json | 2 +- package.yaml | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14c9eadf3..4d8551769 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [27.4.18](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/t27.4.17...t27.4.18) (2023-07-16) + ## [27.4.17](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/t27.4.16...t27.4.17) (2023-07-16) ## [27.4.16](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/t27.4.15...t27.4.16) (2023-07-16) diff --git a/nix/docker/version.json b/nix/docker/version.json index 2c857ea0a..3a246763d 100644 --- a/nix/docker/version.json +++ b/nix/docker/version.json @@ -1,3 +1,3 @@ { - "version": "27.4.17" + "version": "27.4.18" } diff --git a/package-lock.json b/package-lock.json index 70d7a6681..53d8cf06a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.17", + "version": "27.4.18", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b563866f8..598fd4194 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uni2work", - "version": "27.4.17", + "version": "27.4.18", "description": "", "keywords": [], "author": "", diff --git a/package.yaml b/package.yaml index 32c5abf02..eab21aa3e 100644 --- a/package.yaml +++ b/package.yaml @@ -1,5 +1,5 @@ name: uniworx -version: 27.4.17 +version: 27.4.18 dependencies: - base - yesod From 3a7b55ac8e7c36ab54962f3b793560186a23a5a0 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sun, 16 Jul 2023 23:10:00 +0000 Subject: [PATCH 27/27] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7bf624a52..f8b765b92 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -338,7 +338,7 @@ upload test container: stage: release image: quay.io/skopeo/stable:latest script: - - skopeo --insecure-policy copy --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker-archive://$(pwd)/uniworx.tar.gz docker://test/${CI_REGISTRY_IMAGE}:${VERSION} + - skopeo --insecure-policy copy --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker-archive://$(pwd)/uniworx.tar.gz docker://${CI_REGISTRY}/fradrive/fradrive/test:${CI_COMMIT_REF_NAME} - skopeo --insecure-policy copy --src-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" --dest-creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" docker://${CI_REGISTRY}/fradrive/fradrive/test:${CI_COMMIT_REF_NAME} docker://${CI_REGISTRY}/fradrive/fradrive/test:latest needs: - job: node dependencies # transitive