Skip to content

Commit

Permalink
Copy zipfile, avoid duplicate builds for pull requests
Browse files Browse the repository at this point in the history
  • Loading branch information
KjellMorgenstern committed Jul 3, 2019
1 parent fb950d4 commit 86558c2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
10 changes: 4 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ language: minimal
stages:
- name: fast_check
- name: build_and_pack
# Avoid duplicate builds for pull requests
if: type = push OR (type = pull_request AND slug != "fritzing/fritzing-app")
- name: deploy_to_github
if: type = push AND branch IN (develop, master)

Expand Down Expand Up @@ -122,11 +124,7 @@ jobs:

script:
- tools/build-windows.bat "$TRAVIS_COMMIT"-debug-continuous-"$TRAVIS_BUILD_NUMBER"
# - /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/Common7/Tools/VsDevCmd.bat
# - cat /c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio/2017/BuildTools/VC/Auxiliary/Build/vcvars64.bat
# - tools/release_fritzing.bat 0.9.4b 64 2017
# - export PATH="$NMAKE_PATH:$RC_PATH:$PATH"
#- cp ..\release*\* ~/$TRAVIS_BUILD_NUMBER
- cp $TRAVIS_BUILD_DIR/../release64/fritzing-$TRAVIS_COMMIT-debug-continuous-$TRAVIS_BUILD_NUMBER.64.pc.zip ~/$TRAVIS_BUILD_NUMBER

- stage: deploy_to_github
before_install:
Expand All @@ -150,4 +148,4 @@ jobs:
skip_cleanup: true

after_deploy:
- ./tools/aws_tasks.sh cleanup
- ./tools/aws_tasks.sh cleanup
4 changes: 2 additions & 2 deletions tools/release_fritzing.bat
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ pushd %DESTDIR%
set DESTDIR=%CD%
popd

set RELEASE_NAME=%DESTDIR%\forzip\fritzing.%1.%2.pc
set RELEASE_NAME=%DESTDIR%\forzip\fritzing-%1.%2.pc

echo setting up deploy folder. ignore any "The system cannot find ..." messages
rmdir %DESTDIR%\deploy /s /q
Expand Down Expand Up @@ -199,6 +199,6 @@ echo moving deploy to %RELEASE_NAME%
move %DESTDIR%\deploy %RELEASE_NAME%

echo create zip file
7z a "%DESTDIR%\fritzing.%1.%2.pc.zip" "%DESTDIR%\forzip"
7z a "%DESTDIR%\fritzing-%1.%2.pc.zip" "%DESTDIR%\forzip"

echo done

0 comments on commit 86558c2

Please sign in to comment.