[MM-22007] Fix MSI download from S3, don't run when not an RC/release (#1167)

* test halt step

* fix

* [MM-22007] fix msi name

* remove test branch and apply to s3 too
This commit is contained in:
Guillermo Vayá
2020-01-27 10:25:46 +01:00
committed by GitHub
parent e247b5c155
commit 58092e284d
2 changed files with 20 additions and 9 deletions

View File

@@ -227,6 +227,12 @@ jobs:
- checkout - checkout
- attach_workspace: - attach_workspace:
at: ./dist at: ./dist
- run:
name: "Don't upload if it's not on a tag"
command: |
if [ -z `git tag -l --points-at master` ]; then
circleci-agent step halt
fi
- run: - run:
name: "Setup files for aws-s3" name: "Setup files for aws-s3"
command: | command: |
@@ -243,6 +249,12 @@ jobs:
- checkout - checkout
- attach_workspace: - attach_workspace:
at: ./dist at: ./dist
- run:
name: "Don't upload if it's not on a tag"
command: |
if [ -z `git tag -l --points-at master` ]; then
circleci-agent step halt
fi
- run: - run:
name: "Setup files for ghr" name: "Setup files for ghr"
command: | command: |
@@ -273,13 +285,7 @@ workflows:
- build-linux: - build-linux:
requires: requires:
- check - check
filters:
branches:
only:
- /.*/
tags:
ignore:
- /.*/
- build-win-no-installer: - build-win-no-installer:
requires: requires:
- check - check
@@ -287,6 +293,7 @@ workflows:
branches: branches:
ignore: ignore:
- /^release-\d+(\.\d+){1,2}(-rc.*)?/ - /^release-\d+(\.\d+){1,2}(-rc.*)?/
- build-mac-no-dmg: - build-mac-no-dmg:
requires: requires:
- check - check
@@ -294,6 +301,7 @@ workflows:
branches: branches:
ignore: ignore:
- /^release-\d+(\.\d+){1,2}(-rc.*)?/ - /^release-\d+(\.\d+){1,2}(-rc.*)?/
- msi_installer: - msi_installer:
requires: requires:
- check - check
@@ -305,6 +313,7 @@ workflows:
# release-XX.YY.ZZ # release-XX.YY.ZZ
# release-XX.YY.ZZ-rc-something # release-XX.YY.ZZ-rc-something
- /^release-\d+(\.\d+){1,2}(-rc.*)?/ - /^release-\d+(\.\d+){1,2}(-rc.*)?/
- mac_installer: - mac_installer:
requires: requires:
- check - check
@@ -313,6 +322,7 @@ workflows:
branches: branches:
only: only:
- /^release-\d+(\.\d+){1,2}(-rc.*)?/ - /^release-\d+(\.\d+){1,2}(-rc.*)?/
- store_artifacts: - store_artifacts:
# for master/PR builds # for master/PR builds
requires: requires:
@@ -323,6 +333,7 @@ workflows:
branches: branches:
ignore: ignore:
- /^release-\d+(\.\d+){1,2}(-rc.*)?/ - /^release-\d+(\.\d+){1,2}(-rc.*)?/
- upload_to_s3: - upload_to_s3:
# for release builds # for release builds
requires: requires:

View File

@@ -22,8 +22,8 @@ Release notes can be found here: https://docs.mattermost.com/help/apps/desktop-c
The download links can be found below. The download links can be found below.
#### Windows - msi files (beta) #### Windows - msi files (beta)
$(print_link "${BASE_URL}/mattermost-desktop-v${VERSION}-x64.msi") $(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-x64.msi")
$(print_link "${BASE_URL}/mattermost-desktop-v${VERSION}-x86.msi") $(print_link "${BASE_URL}/mattermost-desktop-${VERSION}-x86.msi")
#### Windows - setup exe files #### Windows - setup exe files
$(print_link "${BASE_URL}/mattermost-desktop-setup-${VERSION}-win.exe") $(print_link "${BASE_URL}/mattermost-desktop-setup-${VERSION}-win.exe")