Skip to content

Fix CI Builds for Linux #3313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 1, 2019
Merged

Fix CI Builds for Linux #3313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4409e3
Update install-arduino-core-esp32.sh
me-no-dev Oct 1, 2019
0d53a72
Update get.py
me-no-dev Oct 1, 2019
800358c
Update get.py
me-no-dev Oct 1, 2019
41ce3a8
pretify some debug
me-no-dev Oct 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/scripts/install-arduino-core-esp32.sh
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if [ ! -d "$ARDUINO_ESP32_PATH" ]; then
fi

cd esp32 && \
echo "Updating submodules..." && \
echo "Updating Submodules..." && \
git submodule update --init --recursive > /dev/null 2>&1
if [ $? -ne 0 ]; then echo "ERROR: Submodule update failed"; exit 1; fi

Expand All @@ -32,8 +32,8 @@ if [ ! -d "$ARDUINO_ESP32_PATH" ]; then
if [ $? -ne 0 ]; then echo "ERROR: Install failed"; exit 1; fi
fi

echo "Downloading the tools and the toolchain..."
cd tools && python get.py > /dev/null
echo "Installing Platform Tools..."
cd tools && python get.py
if [ $? -ne 0 ]; then echo "ERROR: Download failed"; exit 1; fi
cd $script_init_path

Expand Down
21 changes: 8 additions & 13 deletions tools/get.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def report_progress(count, blockSize, totalSize):

def unpack(filename, destination):
dirname = ''
print('Extracting {0}'.format(os.path.basename(filename)))
print('Extracting {0} ...'.format(os.path.basename(filename)))
sys.stdout.flush()
if filename.endswith('tar.gz'):
tfile = tarfile.open(filename, 'r:gz')
Expand All @@ -76,7 +76,7 @@ def unpack(filename, destination):
# a little trick to rename tool directories so they don't contain version number
rename_to = re.match(r'^([a-z][^\-]*\-*)+', dirname).group(0).strip('-')
if rename_to != dirname:
print('Renaming {0} to {1}'.format(dirname, rename_to))
print('Renaming {0} to {1} ...'.format(dirname, rename_to))
if os.path.isdir(rename_to):
shutil.rmtree(rename_to)
shutil.move(dirname, rename_to)
Expand Down Expand Up @@ -106,9 +106,8 @@ def get_tool(tool):
archive_name = tool['archiveFileName']
local_path = dist_dir + archive_name
url = tool['url']
#real_hash = tool['checksum'].split(':')[1]
if not os.path.isfile(local_path):
print('Downloading ' + archive_name)
print('Downloading ' + archive_name + ' ...')
sys.stdout.flush()
if 'CYGWIN_NT' in sys_name:
import ssl
Expand All @@ -127,15 +126,11 @@ def get_tool(tool):
download_file(url, local_path)
else:
urlretrieve(url, local_path, report_progress)
sys.stdout.write("\rDone\n")
sys.stdout.flush()
sys.stdout.write("\rDone\n")
sys.stdout.flush()
else:
print('Tool {0} already downloaded'.format(archive_name))
sys.stdout.flush()
#local_hash = sha256sum(local_path)
#if local_hash != real_hash:
# print('Hash mismatch for {0}, delete the file and try again'.format(local_path))
# raise RuntimeError()
unpack(local_path, '.')

def load_tools_list(filename, platform):
Expand All @@ -158,11 +153,11 @@ def identify_platform():
bits = 64
sys_name = platform.system()
sys_platform = platform.platform()
print('System: %s, Info: %s' % (sys_name, sys_platform))
if 'Linux' in sys_name and (sys_platform.find('arm') > 0 or sys_platform.find('aarch64')):
if 'Linux' in sys_name and (sys_platform.find('arm') > 0 or sys_platform.find('aarch64') > 0):
sys_name = 'LinuxARM'
if 'CYGWIN_NT' in sys_name:
sys_name = 'Windows'
print('System: %s, Bits: %d, Info: %s' % (sys_name, bits, sys_platform))
return arduino_platform_names[sys_name][bits]

if __name__ == '__main__':
Expand All @@ -172,4 +167,4 @@ def identify_platform():
mkdir_p(dist_dir)
for tool in tools_to_download:
get_tool(tool)
print('Done')
print('Platform Tools Installed')