Skip to content

Commit

Permalink
add appveyor and travis CI (+22 squashed commits)
Browse files Browse the repository at this point in the history
[e86e3c2] attempt to fix deploy
[62a68fe] attempt to fix deploy
[e372d18] appveyor: specify artifact path
[89c30ab] fix ant call
[11ccf6d] fix esptool name on windows
[6ab7c73] add deploy to appveyor
[690fdb4] fix windows toolchain sha sum
[1106884] Unquote JAVA_HOME
[bb3dcd9] Shallow clone in appveyor
[b1ec7db] travis: deploy tags only, appveyor: set java_home
[9d790f2] disable repeated failure notifications in travis, attempt to fix appveyor.yml
[2d0a499] Run appveyor build in CMD
[11dd735] adding travis deploy, attempt to fix paths on appveyor
[208c1f1] fix toolchain sha sum path for linux
[1a92165] Temporary path hack for appveyor
[9caea0b] fix build.xml
[68eaaf1] linux components and sha sums
[485e457] fix ant bin path
[c6b6573] silent build
[5edd927] fix ant path, add travis
[36d1f17] appveyor: clone using https
[b758833] Add appveyor build script
  • Loading branch information
igrr committed Mar 27, 2015
1 parent 1faf180 commit acc6064
Show file tree
Hide file tree
Showing 9 changed files with 121 additions and 2 deletions.
31 changes: 31 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
sudo: true
language: java

jdk:
- openjdk6

script:
- sudo apt-get update -qq
- sudo apt-get install -qq ant
- pushd build
- echo "" | ant dist
- popd
#- bash -x ./generate-appimage

deploy:
provider: releases
api_key:
secure: eKHcAMuC58JZKRsn1QwbiYE4aL/9dZsybDqqHTo1dUo8x9+3fGed/Dci76ItFFS7SmFfIdl6ej8/Uj0nPK/sIE21blKBe3+L0KAJm0TTq3m0ig1suCmMipCsSW+srWYM0hl58+OKagM4FoHKDjsEnzRDv9Z4xtxyvG+7/XLD1dE=
skip_cleanup: true
file_glob: true
file:
- '$TRAVIS_BUILD_DIR/build/linux/arduino-*.tar.xz'
# - '$TRAVIS_BUILD_DIR/Arduino.AppImage'
on:
tags: true
all_branches: true

notifications:
email:
on_success: change
on_failure: change
67 changes: 67 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
version: 0.0.{build}

platform:
- x86

skip_commits:
message: /\[skip appveyor\]/

shallow_clone: true

matrix:
fast_finish: true

init:
- git config --global url."https://".insteadOf git://

build_script:
- java -version
- javac -version
- where javac
- choco -y install ant
- echo ON
- echo PATH %PATH%
- echo JAVA_HOME %JAVA_HOME%
- echo ANT_HOME %ANT_HOME%
- SET ANT_HOME=C:\tools\apache-ant-1.9.4
- SET PATH=%PATH%;C:\tools\apache-ant-1.9.4\bin
- SET JAVA_HOME=C:\Program Files\Java\jdk1.7.0
- echo PATH %PATH%
- echo JAVA_HOME %JAVA_HOME%
- echo ANT_HOME %ANT_HOME%
- java -version
- javac -version
- ant -version
- cd build
- ant dist < NUL
# - SET PATH=C:\MinGW\bin;C:\MinGW\msys\1.0\bin;%PATH%
# - make all
- for /f %%i in ('git describe --always') do set PRODUCT_VERSION=%%i
# - SET PRODUCT_NAME=esptool-%PRODUCT_VERSION%
# - SET PLATFORM_NAME=win32
# - SET PRODUCT_DIST_NAME=%PRODUCT_NAME%-%PLATFORM_NAME%
- echo %PRODUCT_VERSION%
# - echo %PRODUCT_DIST_NAME%
# - mkdir %PRODUCT_DIST_NAME%
# - cp esptool.exe %PRODUCT_DIST_NAME%\esptool.exe
# - SET PRODUCT_ZIP=%PRODUCT_DIST_NAME%.zip
# - 7z a %PRODUCT_ZIP% %PRODUCT_DIST_NAME%
# - appveyor PushArtifact %PRODUCT_ZIP%
# - SET PRODUCT_ZIP_SHA=%PRODUCT_ZIP%.sha
# - ps: Get-FileHash $env:PRODUCT_ZIP -Algorithm SHA1 | Out-File $env:PRODUCT_ZIP_SHA
# - type %PRODUCT_ZIP_SHA%
# - appveyor PushArtifact %PRODUCT_ZIP_SHA%

artifacts:
- path: build\windows\arduino-*.zip


deploy:
- provider: GitHub
auth_token:
secure: 'PGg5fnoBpP1Omzr6f3KIYDiD8J30rretQjSl/MITRpzvSCmN88kM6VDMz1TBGZTA'
artifact: /.*\.zip/
draft: true
prerelease: false
on:
appveyor_repo_tag: true
19 changes: 18 additions & 1 deletion build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,23 @@
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
</antcall>

<antcall target="untar">
<param name="archive_file" value="${staging_folder}/dist/linux64-xtensa-lx106-elf.tgz" />
<param name="archive_url" value="http://download.igrr.me/linux64-xtensa-lx106-elf.tgz" />
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/xtensa-lx106-elf" />
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
</antcall>

<antcall target="unzip">
<param name="archive_file" value="${staging_folder}/esptool-0.4.2-linux64.zip" />
<param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.2/esptool-0.4.2-linux64.zip" />
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-linux64" />
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
</antcall>
<move file="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-linux64/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool" />
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-linux64/" />

</target>

<target name="linux32-run" depends="linux32-build" description="Run Linux (32-bit) version">
Expand Down Expand Up @@ -907,7 +924,7 @@
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-win32" />
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
</antcall>
<move file="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-win32/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool" />
<move file="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-win32/esptool.exe" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool.exe" />
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-win32/" />

</target>
Expand Down
1 change: 1 addition & 0 deletions build/linux/dist/linux64-xtensa-lx106-elf.tgz.sha
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
43ca9c53d70655456a28c297526204447f65d9cb
1 change: 1 addition & 0 deletions build/linux/esptool-0.4.2-linux64.zip.sha
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b89b50beb56f0f355d8d14104fb01d523140fe91
Binary file added build/macosx/dist/osx-xtensa-lx106-elf.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion build/windows/dist/win32-xtensa-lx106-elf.tgz.sha
Original file line number Diff line number Diff line change
@@ -1 +1 @@
80a15b3885b262da5801b2cbca9951b6b0542500
8d52c4bc92aac25a87352f790038a6e1af5241c5
1 change: 1 addition & 0 deletions build/windows/esptool-0.4.2-win32.zip.sha
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3031f2d590544403f5c1a90dcc7f549b9144b309
1 change: 1 addition & 0 deletions build/windows/win32-xtensa-lx106-elf.tgz.sha
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8d52c4bc92aac25a87352f790038a6e1af5241c5

0 comments on commit acc6064

Please sign in to comment.