From a886515ce926a1ed535aff9558b930bfa01bacf4 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Mon, 8 Feb 2021 12:02:49 -0800 Subject: [PATCH] Fix ESP8266SdFat architecture, Windows CI (#7866) * Fix ESP8266SdFat architecture Avoid problems reported in https://forum.arduino.cc/index.php?topic=726897.msg4889319 * Fix Windows CI, python3 now *maybe* exists Python3 used to be called "python.exe" on earlier VMs, but it looks like the image has been updated and a "python3.exe" does now exist. Update the CI script to first check it "python3" exists, and if not then do the copy hack, OTW do nothing. --- .github/workflows/pull-request.yml | 2 +- libraries/ESP8266SdFat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 598867826..4fa5c200a 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -102,7 +102,7 @@ jobs: run: | # Windows has python3 already installed, but it's called "python". # Copy python.exe to the proper name so scripts "just work". - copy (get-command python).source (get-command python).source.Replace("python.exe", "python3.exe") + try { Get-Command python3 } catch { copy (get-command python).source (get-command python).source.Replace("python.exe", "python3.exe") } bash ./tests/build.sh diff --git a/libraries/ESP8266SdFat b/libraries/ESP8266SdFat index 0a46e4ebb..9f94df41c 160000 --- a/libraries/ESP8266SdFat +++ b/libraries/ESP8266SdFat @@ -1 +1 @@ -Subproject commit 0a46e4ebb2de585c5a64f981dbc2b2223a438984 +Subproject commit 9f94df41ccdb064ff4cb98d7b2737a369f6be1a0