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

Commits:

2 changed files:

Changes:

  • .ci/make_release.py
    ... ... @@ -13,7 +13,7 @@
    13 13
     
    
    14 14
     
    
    15 15
     GITLAB_INSTANCE_URL = 'https://dev.gajim.org'
    
    16
    -PROJECT_ID = 31
    
    16
    +PROJECT_ID = 30
    
    17 17
     
    
    18 18
     
    
    19 19
     def adjust_milestones(project: Project, version: str) -> None:
    

  • .gitlab-ci.yml
    ... ... @@ -146,7 +146,7 @@ deploy-flatpak:
    146 146
         - git commit -m "$CI_COMMIT_TAG"
    
    147 147
         - git push
    
    148 148
     
    
    149
    -publish-release:
    
    149
    +publish-website:
    
    150 150
       image: git-deploy:latest
    
    151 151
       stage: publish
    
    152 152
       dependencies: []
    
    ... ... @@ -156,7 +156,6 @@ publish-release:
    156 156
         - eval $(ssh-agent -s)
    
    157 157
         - .ci/prepare_git.sh dev.gajim.org "${WEBSITE_DEPLOY_KEY}"
    
    158 158
       script:
    
    159
    -    - .ci/make_release.py $CI_COMMIT_TAG "${PROJECT_TOKEN}"
    
    160 159
         - git clone git@dev.gajim.org:gajim/website.git
    
    161 160
         - cd website
    
    162 161
         - git checkout master
    
    ... ... @@ -165,3 +164,12 @@ publish-release:
    165 164
         - git add -u
    
    166 165
         - git commit -m "Release Gajim $CI_COMMIT_TAG"
    
    167 166
         - git push
    
    167
    +
    
    168
    +publish-release:
    
    169
    +  image: git-deploy:latest
    
    170
    +  stage: publish
    
    171
    +  dependencies: []
    
    172
    +  rules:
    
    173
    +    - if: '$CI_COMMIT_TAG'
    
    174
    +  script:
    
    175
    +    - .ci/make_release.py $CI_COMMIT_TAG "${PROJECT_TOKEN}"