arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-21 10:26:06 +03:00
Code

Use smarter cache key, cache Arduino IDE (#7791)

Browse Source 
Thanks to @mcspr.  Make sure the cached toolchain is only valid when the
package.json file is identical.  Also, add the Arduino IDE to the cache
to avoid re-downloads.
This commit is contained in:
Earle F. Philhower, III 2020-12-23 15:00:04 -08:00 committed by GitHub
parent c487ca5233
commit 5356c87b5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/pull-request.yml vendored
View File

@ -30,7 +30,7 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ./tools/dist path: ./tools/dist
key: key-linux-toolchain key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh') }}
- name: Build Sketches - name: Build Sketches
env: env:
TRAVIS_BUILD_DIR: ${{ github.workspace }} TRAVIS_BUILD_DIR: ${{ github.workspace }}
@ -62,7 +62,7 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ./tools/dist path: ./tools/dist
key: key-linux-toolchain key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh') }}
- name: Build Sketches - name: Build Sketches
env: env:
TRAVIS_BUILD_DIR: ${{ github.workspace }} TRAVIS_BUILD_DIR: ${{ github.workspace }}
@ -90,7 +90,7 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ./tools/dist path: ./tools/dist
key: key-windows-toolchain key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh') }}
- name: Build Sketch - name: Build Sketch
env: env:
TRAVIS_BUILD_DIR: ${{ github.workspace }} TRAVIS_BUILD_DIR: ${{ github.workspace }}
@ -122,7 +122,7 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ./tools/dist path: ./tools/dist
key: key-mac-toolchain key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh') }}
- name: Build Sketch - name: Build Sketch
env: env:
TRAVIS_BUILD_DIR: ${{ github.workspace }} TRAVIS_BUILD_DIR: ${{ github.workspace }}
@ -260,7 +260,7 @@ jobs:
uses: actions/cache@v2 uses: actions/cache@v2
with: with:
path: ./tools/dist path: ./tools/dist
key: key-linux-toolchain key: ${{ runner.os }}-${{ hashFiles('package/package_esp8266com_index.template.json', 'tests/common.sh') }}
- name: Boards.txt diff - name: Boards.txt diff
env: env:
TRAVIS_BUILD_DIR: ${{ github.workspace }} TRAVIS_BUILD_DIR: ${{ github.workspace }}

13
tests/common.sh
View File

@ -164,9 +164,10 @@ function install_ide()
local ide_path=$1 local ide_path=$1
local core_path=$2 local core_path=$2
local debug=$3 local debug=$3
mkdir -p ${core_path}/tools/dist
if [ "$WINDOWS" = "1" ]; then if [ "$WINDOWS" = "1" ]; then
test -r arduino-windows.zip || curl --output arduino-windows.zip -L "${ideurl}-windows.zip" test -r ${core_path}/tools/dist/arduino-windows.zip || curl --output ${core_path}/tools/dist/arduino-windows.zip -L "${ideurl}-windows.zip"
unzip -q arduino-windows.zip unzip -q ${core_path}/tools/dist/arduino-windows.zip
mv arduino-${idever} arduino-distrib mv arduino-${idever} arduino-distrib
elif [ "$MACOSX" = "1" ]; then elif [ "$MACOSX" = "1" ]; then
# MACOS only has next-to-obsolete Python2 installed. Install Python 3 from python.org # MACOS only has next-to-obsolete Python2 installed. Install Python 3 from python.org
@ -175,13 +176,13 @@ function install_ide()
# Install the Python3 certificates, because SSL connections fail w/o them and of course they aren't installed by default. # Install the Python3 certificates, because SSL connections fail w/o them and of course they aren't installed by default.
( cd "/Applications/Python 3.7/" && sudo "./Install Certificates.command" ) ( cd "/Applications/Python 3.7/" && sudo "./Install Certificates.command" )
# Hack to place arduino-builder in the same spot as sane OSes # Hack to place arduino-builder in the same spot as sane OSes
test -r arduino-macos.zip || wget -q -O arduino-macos.zip "${ideurl}-macosx.zip" test -r ${core_path}/tools/dist/arduino-macos.zip || wget -q -O ${core_path}/tools/dist/arduino-macos.zip "${ideurl}-macosx.zip"
unzip -q arduino-macos.zip unzip -q ${core_path}/tools/dist/arduino-macos.zip
mv Arduino.app arduino-distrib mv Arduino.app arduino-distrib
mv arduino-distrib/Contents/Java/* arduino-distrib/. mv arduino-distrib/Contents/Java/* arduino-distrib/.
else else
test -r arduino-linux.tar.xz || wget -q -O arduino-linux.tar.xz "${ideurl}-linux64.tar.xz" test -r ${core_path}/tools/dist/arduino-linux.tar.xz || wget -q -O ${core_path}/tools/dist/arduino-linux.tar.xz "${ideurl}-linux64.tar.xz"
tar xf arduino-linux.tar.xz tar xf ${core_path}/tools/dist/arduino-linux.tar.xz
mv arduino-${idever} arduino-distrib mv arduino-${idever} arduino-distrib
fi fi
mv arduino-distrib $ide_path mv arduino-distrib $ide_path