From 46527b236bbfc3a534acf354c3487a8ef5536e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Mon, 14 Feb 2022 13:21:23 +0000 Subject: [PATCH 1/3] Add "deploy" stage to .gitlab-ci.yml --- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f9fc4a1..76f8fc6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ stages: - build - release + - deploy Build: stage: build @@ -135,3 +136,9 @@ Release: - name: macOS aarch64 (sha256sum) link_type: other url: $CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/librewolf-$VERSION-$RELEASE.mac.aarch64.dmg.sha256sum + +Update Repositories: + stage: deploy + image: curlimages/curl + script: + - curl https://shorsh.de/update_lw_repos.php?version=$(cat version)-$(cat release)&log=true&token=$REPO_DEPLOY_TOKEN From 9dc759f137687c7441bbd461fede1fa05429d729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Mon, 14 Feb 2022 13:24:21 +0000 Subject: [PATCH 2/3] Add better release description to .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 76f8fc6..f3f0dda 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,7 +85,7 @@ Release: upload_package macos-aarch64 librewolf-$VERSION-$RELEASE.mac.aarch64.dmg.sha256sum release: tag_name: "$VERSION-$RELEASE" - description: "LibreWolf v$VERSION-$RELEASE" + description: "## LibreWolf bsys5 Release v$VERSION-$RELEASE\n\n- \n\n(Built on GitLab by pipeline [$CI_PIPELINE_ID](https://gitlab.com/librewolf-community/browser/bsys5/-/pipelines/$CI_PIPELINE_ID))" assets: links: - name: Debian 11 (deb) From 06fa2bc5d4150f5559d1e0d6f3a08208556ae692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malte=20J=C3=BCrgens?= Date: Mon, 14 Feb 2022 16:54:17 +0000 Subject: [PATCH 3/3] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f3f0dda..1ce180c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,25 +64,25 @@ Release: function upload_package() { curl \ --header "JOB-TOKEN: $CI_JOB_TOKEN" \ - --upload-file "artifacts/$1/$2" \ - "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/$2" + --upload-file "$1" \ + "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/librewolf/$VERSION-$RELEASE/$1" } - upload_package debian11 librewolf-$VERSION-$RELEASE.en-US.debian11.x86_64.deb - upload_package debian11 librewolf-$VERSION-$RELEASE.en-US.debian11.x86_64.deb.sha256sum - upload_package ubuntu20 librewolf-$VERSION-$RELEASE.en-US.ubuntu20.x86_64.deb - upload_package ubuntu20 librewolf-$VERSION-$RELEASE.en-US.ubuntu20.x86_64.deb.sha256sum - upload_package ubuntu21 librewolf-$VERSION-$RELEASE.en-US.ubuntu21.x86_64.deb - upload_package ubuntu21 librewolf-$VERSION-$RELEASE.en-US.ubuntu21.x86_64.deb.sha256sum - upload_package mint20 librewolf-$VERSION-$RELEASE.en-US.mint20.x86_64.deb - upload_package mint20 librewolf-$VERSION-$RELEASE.en-US.mint20.x86_64.deb.sha256sum - upload_package fedora34 librewolf-$VERSION-$RELEASE.fc34.x86_64.rpm - upload_package fedora34 librewolf-$VERSION-$RELEASE.fc34.x86_64.rpm.sha256sum - upload_package fedora35 librewolf-$VERSION-$RELEASE.fc35.x86_64.rpm - upload_package fedora35 librewolf-$VERSION-$RELEASE.fc35.x86_64.rpm.sha256sum - upload_package macos-x86_64 librewolf-$VERSION-$RELEASE.mac.x86_64.dmg - upload_package macos-x86_64 librewolf-$VERSION-$RELEASE.mac.x86_64.dmg.sha256sum - upload_package macos-aarch64 librewolf-$VERSION-$RELEASE.mac.aarch64.dmg - upload_package macos-aarch64 librewolf-$VERSION-$RELEASE.mac.aarch64.dmg.sha256sum + upload_package librewolf-$VERSION-$RELEASE.en-US.debian11.x86_64.deb + upload_package librewolf-$VERSION-$RELEASE.en-US.debian11.x86_64.deb.sha256sum + upload_package librewolf-$VERSION-$RELEASE.en-US.ubuntu20.x86_64.deb + upload_package librewolf-$VERSION-$RELEASE.en-US.ubuntu20.x86_64.deb.sha256sum + upload_package librewolf-$VERSION-$RELEASE.en-US.ubuntu21.x86_64.deb + upload_package librewolf-$VERSION-$RELEASE.en-US.ubuntu21.x86_64.deb.sha256sum + upload_package librewolf-$VERSION-$RELEASE.en-US.mint20.x86_64.deb + upload_package librewolf-$VERSION-$RELEASE.en-US.mint20.x86_64.deb.sha256sum + upload_package librewolf-$VERSION-$RELEASE.fc34.x86_64.rpm + upload_package librewolf-$VERSION-$RELEASE.fc34.x86_64.rpm.sha256sum + upload_package librewolf-$VERSION-$RELEASE.fc35.x86_64.rpm + upload_package librewolf-$VERSION-$RELEASE.fc35.x86_64.rpm.sha256sum + upload_package librewolf-$VERSION-$RELEASE.mac.x86_64.dmg + upload_package librewolf-$VERSION-$RELEASE.mac.x86_64.dmg.sha256sum + upload_package librewolf-$VERSION-$RELEASE.mac.aarch64.dmg + upload_package librewolf-$VERSION-$RELEASE.mac.aarch64.dmg.sha256sum release: tag_name: "$VERSION-$RELEASE" description: "## LibreWolf bsys5 Release v$VERSION-$RELEASE\n\n- \n\n(Built on GitLab by pipeline [$CI_PIPELINE_ID](https://gitlab.com/librewolf-community/browser/bsys5/-/pipelines/$CI_PIPELINE_ID))"