Skip to content

Commit 50a67ec

Browse files
committed
Update Appveyor and Travis CI/CD to Processing 4
1 parent 3b37855 commit 50a67ec

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

.travis.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
branches:
1313
only:
1414
- master
15-
#- development
15+
- development
1616

1717
before_install:
1818
- if [ "$TRAVIS_OS_NAME" = osx ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then openssl aes-256-cbc -K $encrypted_2f5d2771e3cb_key -iv $encrypted_2f5d2771e3cb_iv -in release_script/mac_only/Certificates.p12.enc -out release_script/mac_only/Certificates.p12 -d; fi
@@ -28,16 +28,16 @@ install:
2828
- mkdir $TRAVIS_BUILD_DIR/temp; cd $TRAVIS_BUILD_DIR/temp
2929

3030
### ### LINUX ### ###
31-
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then curl -O -L --insecure https://github.com/processing/processing/releases/download/processing-0269-3.5.3/processing-3.5.3-linux64.tgz ;fi
32-
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then tar -xzvf processing-3.5.3-linux64.tgz ;fi
33-
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then export PATH=$TRAVIS_BUILD_DIR/temp/processing-3.5.3:$PATH ;fi
31+
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then curl -O -L --insecure https://github.com/processing/processing4/releases/download/processing-1292-4.2/processing-4.2-linux-x64.tgz ;fi
32+
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then tar -xzvf processing-4.2-linux-x64.tgz ;fi
33+
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then export PATH=$TRAVIS_BUILD_DIR/temp/processing-4.2:$PATH ;fi
3434
# copy libraries to linux location
3535
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then mkdir -p $HOME/sketchbook/libraries/ ;fi
3636
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cp -a $TRAVIS_BUILD_DIR/OpenBCI_GUI/libraries/. $HOME/sketchbook/libraries/ ;fi
3737

3838
### ### MAC ### ###
39-
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then curl -O -L --insecure https://github.com/processing/processing/releases/download/processing-0269-3.5.3/processing-3.5.3-macosx.zip ;fi
40-
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then unzip processing-3.5.3-macosx.zip ;fi
39+
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then curl -O -L --insecure https://github.com/processing/processing4/releases/download/processing-1292-4.2/processing-4.2-macos-x64.zip ;fi
40+
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then unzip processing-4.2-macos-x64.zip ;fi
4141
# Processing.app must be in this location for processing-java to work
4242
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then mv Processing.app /Applications/Processing.app ;fi
4343
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then export PATH=$TRAVIS_BUILD_DIR/release_script/mac_only:$PATH ;fi
@@ -51,7 +51,7 @@ install:
5151

5252
script:
5353
- cd $TRAVIS_BUILD_DIR
54-
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then python $TRAVIS_BUILD_DIR/OpenBCI_GUI_UnitTests/run-unittests.py ;fi
54+
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then python3 $TRAVIS_BUILD_DIR/OpenBCI_GUI_UnitTests/run-unittests.py ;fi
5555
- python3 $TRAVIS_BUILD_DIR/release_script/make-release.py --no-prompts
5656
# over script will write version and timestamp here
5757
- GUI_COMMIT_TIME=`cat temp/timestamp.txt`

appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ build: off
2121

2222
init:
2323
# add processing-java to the path as well as mt.exe (release script uses it to modify the manifest.xml)
24-
- cmd: set PATH=%APPVEYOR_BUILD_FOLDER%\temp\processing-3.5.3;C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64\;%PATH%
24+
- cmd: set PATH=%APPVEYOR_BUILD_FOLDER%\temp\processing-4.2;C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64\;%PATH%
2525

2626
install:
2727
# used for getting commit timestamp
@@ -34,8 +34,8 @@ install:
3434

3535
- mkdir %APPVEYOR_BUILD_FOLDER%\temp
3636
- cd %APPVEYOR_BUILD_FOLDER%\temp
37-
- appveyor DownloadFile https://github.com/processing/processing/releases/download/processing-0269-3.5.3/processing-3.5.3-windows64.zip
38-
- 7z x processing-3.5.3-windows64.zip -y -aoa
37+
- appveyor DownloadFile https://github.com/processing/processing4/releases/download/processing-1292-4.2/processing-4.2-windows-x64.zip
38+
- 7z x processing-4.2-windows-x64.zip -y -aoa
3939
# cp libraries
4040
- mkdir %userprofile%\documents\processing\libraries
4141
- xcopy %APPVEYOR_BUILD_FOLDER%\OpenBCI_GUI\libraries\* %userprofile%\documents\processing\libraries /s /i /q

0 commit comments

Comments
 (0)