Philipp Hörist pushed to branch master at gajim / gajim

Commits: f5c36b36 by Philipp Hörist at 2023-01-14T15:15:55+01:00 ci: Fix project id in release script

- - - - - b79a219d by Philipp Hörist at 2023-01-14T15:17:09+01:00 ci: Execute release in a separate step

So that if it fails the website publishing does not fail

- - - - -

2 changed files:

- .ci/make_release.py - .gitlab-ci.yml

Changes:

===================================== .ci/make_release.py ===================================== @@ -13,7 +13,7 @@

GITLAB_INSTANCE_URL = 'https://dev.gajim.org' -PROJECT_ID = 31 +PROJECT_ID = 30

def adjust_milestones(project: Project, version: str) -> None:

===================================== .gitlab-ci.yml ===================================== @@ -146,7 +146,7 @@ deploy-flatpak: - git commit -m "$CI_COMMIT_TAG" - git push

-publish-release: +publish-website: image: git-deploy:latest stage: publish dependencies: [] @@ -156,7 +156,6 @@ publish-release: - eval $(ssh-agent -s) - .ci/prepare_git.sh dev.gajim.org "${WEBSITE_DEPLOY_KEY}" script: - - .ci/make_release.py $CI_COMMIT_TAG "${PROJECT_TOKEN}" - git clone git@dev.gajim.org:gajim/website.git - cd website - git checkout master @@ -165,3 +164,12 @@ publish-release: - git add -u - git commit -m "Release Gajim $CI_COMMIT_TAG" - git push + +publish-release: + image: git-deploy:latest + stage: publish + dependencies: [] + rules: + - if: '$CI_COMMIT_TAG' + script: + - .ci/make_release.py $CI_COMMIT_TAG "${PROJECT_TOKEN}"

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/64ee81ce6afaadeeb0feb6b5336058b3...