From 2e8929234f4a4b5d08482ca09e357355c6ad9e1b Mon Sep 17 00:00:00 2001 From: s3lph Date: Mon, 28 Dec 2020 10:41:30 +0100 Subject: [PATCH 1/3] Quickfix Archlinux package CI --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a5691a..e95bac8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -109,10 +109,10 @@ build_archlinux: - rm -rf matemat/usr/bin - sed -re "s/__VERSION__/${MATEMAT_VERSION}/g" -i PKGBUILD - sudo -u nobody makepkg -c - - sha256sum *.pkg.tar.xz > SHA256SUMS + - sha256sum *.pkg.tar.zst > SHA256SUMS artifacts: paths: - - "package/archlinux/*.pkg.tar.xz" + - "package/archlinux/*.pkg.tar.zst" - package/archlinux/SHA256SUMS only: - tags From 75b0f2fa8577862838a21ea36c99ba4d799f911c Mon Sep 17 00:00:00 2001 From: s3lph Date: Mon, 28 Dec 2020 10:59:07 +0100 Subject: [PATCH 2/3] Quickfix docker build; apparently gitlab introduced a new feature that clashed with the configured CI variables --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e95bac8..3f39470 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ build_docker: - docker build -t "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_SHA" -f package/docker/Dockerfile . - docker tag "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_SHA" "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_REF_NAME" - if [[ -n "$CI_COMMIT_TAG" ]]; then docker tag "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_SHA" "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_TAG"; fi - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_TOKEN registry.gitlab.com + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com - docker push "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_SHA" - docker push "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_REF_NAME" - if [[ -n "$CI_COMMIT_TAG" ]]; then docker push "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_TAG"; fi From f5dc0e51c77154a2657933516cb2e0e90c393d18 Mon Sep 17 00:00:00 2001 From: s3lph <1375407-s3lph@users.noreply.gitlab.com> Date: Tue, 19 Jul 2022 00:03:49 +0200 Subject: [PATCH 3/3] Fix changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06e1b4a..6e1140b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ Bugfix release - Add missing email field in signup form - + ## Version 0.2.11