zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Travis: use force to overwrite tag

pull/783/head
Koen Schmeets 2020-10-25 21:00:40 +01:00
parent 57f8b37270
commit 5388e10649
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -26,7 +26,7 @@ jobs:
- git config --local user.name "solvespace-cd"
- git config --local user.email "no-reply@solvespace.com"
- export TRAVIS_TAG=${TRAVIS_TAG:-edge}
- git tag $TRAVIS_TAG
- git tag --force $TRAVIS_TAG
deploy:
provider: releases
skip_cleanup: true
@ -36,8 +36,6 @@ jobs:
name: ${TRAVIS_TAG:-edge}
release_notes: $TRAVIS_COMMIT_MESSAGE
file: build/bin/SolveSpace.dmg
on:
repo: solvespace/solvespace
- stage: test
name: "Ubuntu"
os: linux
@ -58,7 +56,7 @@ jobs:
- git config --local user.name "solvespace-cd"
- git config --local user.email "no-reply@solvespace.com"
- export TRAVIS_TAG=${TRAVIS_TAG:-edge}
- git tag $TRAVIS_TAG
- git tag --force $TRAVIS_TAG
deploy:
provider: releases
skip_cleanup: true
@ -68,8 +66,6 @@ jobs:
name: ${TRAVIS_TAG:-edge}
release_notes: $TRAVIS_COMMIT_MESSAGE
file: build/bin/RelWithDebInfo/solvespace.exe
on:
repo: solvespace/solvespace
- stage: deploy
name: "Windows with OpenMP"
os: windows
@ -79,7 +75,7 @@ jobs:
- git config --local user.name "solvespace-cd"
- git config --local user.email "no-reply@solvespace.com"
- export TRAVIS_TAG=${TRAVIS_TAG:-edge}
- git tag $TRAVIS_TAG
- git tag --force $TRAVIS_TAG
deploy:
provider: releases
skip_cleanup: true
@ -89,8 +85,6 @@ jobs:
name: ${TRAVIS_TAG:-edge}
release_notes: $TRAVIS_COMMIT_MESSAGE
file: build/bin/RelWithDebInfo/solvespace-openmp.exe
on:
repo: solvespace/solvespace
- &deploy-snap
stage: deploy
name: Snap amd64

2
.travis/sign-macos.sh
View File

@ -46,7 +46,7 @@ for (( ; ; ))
do
echo "Checking progress..."
progress=$(xcrun altool --notarization-info "${notarize_uuid}" -u "${MACOS_APPSTORE_USERNAME}" -p "${MACOS_APPSTORE_APP_PASSWORD}" 2>&1)
echo "${progress}"
# echo "${progress}"
if [ $? -ne 0 ] || [[ "${progress}" =~ "Invalid" ]] ; then
echo "Error with notarization. Exiting"