Skip to content

Commit acc6064

Browse files
igrrigrr
committed
add appveyor and travis CI (+22 squashed commits)
[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
1 parent 1faf180 commit acc6064

9 files changed

+121
-2
lines changed

‎.travis.yml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
sudo: true
2+
language: java
3+
4+
jdk:
5+
- openjdk6
6+
7+
script:
8+
- sudo apt-get update -qq
9+
- sudo apt-get install -qq ant
10+
- pushd build
11+
- echo "" | ant dist
12+
- popd
13+
#- bash -x ./generate-appimage
14+
15+
deploy:
16+
provider: releases
17+
api_key:
18+
secure: eKHcAMuC58JZKRsn1QwbiYE4aL/9dZsybDqqHTo1dUo8x9+3fGed/Dci76ItFFS7SmFfIdl6ej8/Uj0nPK/sIE21blKBe3+L0KAJm0TTq3m0ig1suCmMipCsSW+srWYM0hl58+OKagM4FoHKDjsEnzRDv9Z4xtxyvG+7/XLD1dE=
19+
skip_cleanup: true
20+
file_glob: true
21+
file:
22+
- '$TRAVIS_BUILD_DIR/build/linux/arduino-*.tar.xz'
23+
# - '$TRAVIS_BUILD_DIR/Arduino.AppImage'
24+
on:
25+
tags: true
26+
all_branches: true
27+
28+
notifications:
29+
email:
30+
on_success: change
31+
on_failure: change

‎appveyor.yml

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
version: 0.0.{build}
2+
3+
platform:
4+
- x86
5+
6+
skip_commits:
7+
message: /\[skip appveyor\]/
8+
9+
shallow_clone: true
10+
11+
matrix:
12+
fast_finish: true
13+
14+
init:
15+
- git config --global url."https://".insteadOf git://
16+
17+
build_script:
18+
- java -version
19+
- javac -version
20+
- where javac
21+
- choco -y install ant
22+
- echo ON
23+
- echo PATH %PATH%
24+
- echo JAVA_HOME %JAVA_HOME%
25+
- echo ANT_HOME %ANT_HOME%
26+
- SET ANT_HOME=C:\tools\apache-ant-1.9.4
27+
- SET PATH=%PATH%;C:\tools\apache-ant-1.9.4\bin
28+
- SET JAVA_HOME=C:\Program Files\Java\jdk1.7.0
29+
- echo PATH %PATH%
30+
- echo JAVA_HOME %JAVA_HOME%
31+
- echo ANT_HOME %ANT_HOME%
32+
- java -version
33+
- javac -version
34+
- ant -version
35+
- cd build
36+
- ant dist < NUL
37+
# - SET PATH=C:\MinGW\bin;C:\MinGW\msys\1.0\bin;%PATH%
38+
# - make all
39+
- for /f %%i in ('git describe --always') do set PRODUCT_VERSION=%%i
40+
# - SET PRODUCT_NAME=esptool-%PRODUCT_VERSION%
41+
# - SET PLATFORM_NAME=win32
42+
# - SET PRODUCT_DIST_NAME=%PRODUCT_NAME%-%PLATFORM_NAME%
43+
- echo %PRODUCT_VERSION%
44+
# - echo %PRODUCT_DIST_NAME%
45+
# - mkdir %PRODUCT_DIST_NAME%
46+
# - cp esptool.exe %PRODUCT_DIST_NAME%\esptool.exe
47+
# - SET PRODUCT_ZIP=%PRODUCT_DIST_NAME%.zip
48+
# - 7z a %PRODUCT_ZIP% %PRODUCT_DIST_NAME%
49+
# - appveyor PushArtifact %PRODUCT_ZIP%
50+
# - SET PRODUCT_ZIP_SHA=%PRODUCT_ZIP%.sha
51+
# - ps: Get-FileHash $env:PRODUCT_ZIP -Algorithm SHA1 | Out-File $env:PRODUCT_ZIP_SHA
52+
# - type %PRODUCT_ZIP_SHA%
53+
# - appveyor PushArtifact %PRODUCT_ZIP_SHA%
54+
55+
artifacts:
56+
- path: build\windows\arduino-*.zip
57+
58+
59+
deploy:
60+
- provider: GitHub
61+
auth_token:
62+
secure: 'PGg5fnoBpP1Omzr6f3KIYDiD8J30rretQjSl/MITRpzvSCmN88kM6VDMz1TBGZTA'
63+
artifact: /.*\.zip/
64+
draft: true
65+
prerelease: false
66+
on:
67+
appveyor_repo_tag: true

‎build/build.xml

+18-1
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,23 @@
651651
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
652652
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
653653
</antcall>
654+
655+
<antcall target="untar">
656+
<param name="archive_file" value="${staging_folder}/dist/linux64-xtensa-lx106-elf.tgz" />
657+
<param name="archive_url" value="http://download.igrr.me/linux64-xtensa-lx106-elf.tgz" />
658+
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/xtensa-lx106-elf" />
659+
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
660+
</antcall>
661+
662+
<antcall target="unzip">
663+
<param name="archive_file" value="${staging_folder}/esptool-0.4.2-linux64.zip" />
664+
<param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.2/esptool-0.4.2-linux64.zip" />
665+
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-linux64" />
666+
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
667+
</antcall>
668+
<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" />
669+
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-linux64/" />
670+
654671
</target>
655672

656673
<target name="linux32-run" depends="linux32-build" description="Run Linux (32-bit) version">
@@ -907,7 +924,7 @@
907924
<param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-win32" />
908925
<param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
909926
</antcall>
910-
<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" />
927+
<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" />
911928
<delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-win32/" />
912929

913930
</target>

‎build/linux/dist/linux64-xtensa-lx106-elf.tgz.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
43ca9c53d70655456a28c297526204447f65d9cb

‎build/linux/esptool-0.4.2-linux64.zip.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b89b50beb56f0f355d8d14104fb01d523140fe91

‎build/macosx/dist/osx-xtensa-lx106-elf.tgz

33.7 MB
Binary file not shown.

‎build/windows/dist/win32-xtensa-lx106-elf.tgz.sha

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
80a15b3885b262da5801b2cbca9951b6b0542500
1+
8d52c4bc92aac25a87352f790038a6e1af5241c5

‎build/windows/esptool-0.4.2-win32.zip.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3031f2d590544403f5c1a90dcc7f549b9144b309

‎build/windows/win32-xtensa-lx106-elf.tgz.sha

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8d52c4bc92aac25a87352f790038a6e1af5241c5

0 commit comments

Comments
 (0)