Skip to content

Commit 539d81f

Browse files
Richard3366Richard3366
authored
Merge branch 'master' into master
2 parents 317dfed + 4098c53 commit 539d81f

File tree

6 files changed

+82
-54
lines changed

6 files changed

+82
-54
lines changed

Diff for: ‎.github/workflows/docs_build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches:
66
- master
7-
- release/*
7+
- release/v2.x
88
paths:
99
- 'docs/**'
1010
- '.github/workflows/docs_build.yml'

Diff for: ‎.github/workflows/docs_deploy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
types: [published]
66
push:
77
branches:
8-
- release/*
8+
- release/v2.x
99
- master
1010
paths:
1111
- 'docs/**'

Diff for: ‎.github/workflows/push.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
push:
66
branches:
77
- master
8-
- release/*
8+
- release/v2.x
99
pull_request:
1010
paths:
1111
- 'cores/**'

Diff for: ‎package/package_esp32_index.template.json

+34-34
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
{
4343
"packager": "esp32",
4444
"name": "esp32-arduino-libs",
45-
"version": "idf-release_v5.1-c608177cf9"
45+
"version": "idf-release_v5.1-d38afc77"
4646
},
4747
{
4848
"packager": "esp32",
@@ -105,63 +105,63 @@
105105
"tools": [
106106
{
107107
"name": "esp32-arduino-libs",
108-
"version": "idf-release_v5.1-c608177cf9",
108+
"version": "idf-release_v5.1-d38afc77",
109109
"systems": [
110110
{
111111
"host": "i686-mingw32",
112-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/7b015a59844d511b72663a266e5793fb98eecaa1",
113-
"archiveFileName": "esp32-arduino-libs-7b015a59844d511b72663a266e5793fb98eecaa1.zip",
114-
"checksum": "SHA-256:392c411dc6b8253a3d067fda6c41a3f67ade2f99259a1a707630568e8f80f055",
115-
"size": "310235817"
112+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-d38afc77.zip",
113+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-d38afc77.zip",
114+
"checksum": "SHA-256:ab6659cf32833ab503de31d5b4ecd77979edf5e98c0104b456d70636c393b5c4",
115+
"size": "308243283"
116116
},
117117
{
118118
"host": "x86_64-mingw32",
119-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/7b015a59844d511b72663a266e5793fb98eecaa1",
120-
"archiveFileName": "esp32-arduino-libs-7b015a59844d511b72663a266e5793fb98eecaa1.zip",
121-
"checksum": "SHA-256:392c411dc6b8253a3d067fda6c41a3f67ade2f99259a1a707630568e8f80f055",
122-
"size": "310235817"
119+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-d38afc77.zip",
120+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-d38afc77.zip",
121+
"checksum": "SHA-256:ab6659cf32833ab503de31d5b4ecd77979edf5e98c0104b456d70636c393b5c4",
122+
"size": "308243283"
123123
},
124124
{
125125
"host": "arm64-apple-darwin",
126-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/7b015a59844d511b72663a266e5793fb98eecaa1",
127-
"archiveFileName": "esp32-arduino-libs-7b015a59844d511b72663a266e5793fb98eecaa1.zip",
128-
"checksum": "SHA-256:392c411dc6b8253a3d067fda6c41a3f67ade2f99259a1a707630568e8f80f055",
129-
"size": "310235817"
126+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-d38afc77.zip",
127+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-d38afc77.zip",
128+
"checksum": "SHA-256:ab6659cf32833ab503de31d5b4ecd77979edf5e98c0104b456d70636c393b5c4",
129+
"size": "308243283"
130130
},
131131
{
132132
"host": "x86_64-apple-darwin",
133-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/7b015a59844d511b72663a266e5793fb98eecaa1",
134-
"archiveFileName": "esp32-arduino-libs-7b015a59844d511b72663a266e5793fb98eecaa1.zip",
135-
"checksum": "SHA-256:392c411dc6b8253a3d067fda6c41a3f67ade2f99259a1a707630568e8f80f055",
136-
"size": "310235817"
133+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-d38afc77.zip",
134+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-d38afc77.zip",
135+
"checksum": "SHA-256:ab6659cf32833ab503de31d5b4ecd77979edf5e98c0104b456d70636c393b5c4",
136+
"size": "308243283"
137137
},
138138
{
139139
"host": "x86_64-pc-linux-gnu",
140-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/7b015a59844d511b72663a266e5793fb98eecaa1",
141-
"archiveFileName": "esp32-arduino-libs-7b015a59844d511b72663a266e5793fb98eecaa1.zip",
142-
"checksum": "SHA-256:392c411dc6b8253a3d067fda6c41a3f67ade2f99259a1a707630568e8f80f055",
143-
"size": "310235817"
140+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-d38afc77.zip",
141+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-d38afc77.zip",
142+
"checksum": "SHA-256:ab6659cf32833ab503de31d5b4ecd77979edf5e98c0104b456d70636c393b5c4",
143+
"size": "308243283"
144144
},
145145
{
146146
"host": "i686-pc-linux-gnu",
147-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/7b015a59844d511b72663a266e5793fb98eecaa1",
148-
"archiveFileName": "esp32-arduino-libs-7b015a59844d511b72663a266e5793fb98eecaa1.zip",
149-
"checksum": "SHA-256:392c411dc6b8253a3d067fda6c41a3f67ade2f99259a1a707630568e8f80f055",
150-
"size": "310235817"
147+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-d38afc77.zip",
148+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-d38afc77.zip",
149+
"checksum": "SHA-256:ab6659cf32833ab503de31d5b4ecd77979edf5e98c0104b456d70636c393b5c4",
150+
"size": "308243283"
151151
},
152152
{
153153
"host": "aarch64-linux-gnu",
154-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/7b015a59844d511b72663a266e5793fb98eecaa1",
155-
"archiveFileName": "esp32-arduino-libs-7b015a59844d511b72663a266e5793fb98eecaa1.zip",
156-
"checksum": "SHA-256:392c411dc6b8253a3d067fda6c41a3f67ade2f99259a1a707630568e8f80f055",
157-
"size": "310235817"
154+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-d38afc77.zip",
155+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-d38afc77.zip",
156+
"checksum": "SHA-256:ab6659cf32833ab503de31d5b4ecd77979edf5e98c0104b456d70636c393b5c4",
157+
"size": "308243283"
158158
},
159159
{
160160
"host": "arm-linux-gnueabihf",
161-
"url": "https://codeload.github.com/espressif/esp32-arduino-libs/zip/7b015a59844d511b72663a266e5793fb98eecaa1",
162-
"archiveFileName": "esp32-arduino-libs-7b015a59844d511b72663a266e5793fb98eecaa1.zip",
163-
"checksum": "SHA-256:392c411dc6b8253a3d067fda6c41a3f67ade2f99259a1a707630568e8f80f055",
164-
"size": "310235817"
161+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-d38afc77.zip",
162+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.1-d38afc77.zip",
163+
"checksum": "SHA-256:ab6659cf32833ab503de31d5b4ecd77979edf5e98c0104b456d70636c393b5c4",
164+
"size": "308243283"
165165
}
166166
]
167167
},

Diff for: ‎tools/get.exe

-86.5 KB
Binary file not shown.

Diff for: ‎tools/get.py

+45-17
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,36 @@ def verify_files(filename, destination, rename_to):
147147
return True
148148

149149

150-
def unpack(filename, destination, force_extract): # noqa: C901
150+
def is_latest_version(destination, dirname, rename_to, cfile, checksum):
151+
current_version = None
152+
expected_version = None
153+
154+
try:
155+
expected_version = checksum
156+
with open(os.path.join(destination, rename_to, ".package_checksum"), "r") as f:
157+
current_version = f.read()
158+
159+
if verbose:
160+
print(f"\nTool: {rename_to}")
161+
print(f"Current version: {current_version}")
162+
print(f"Expected version: {expected_version}")
163+
164+
if current_version and current_version == expected_version:
165+
if verbose:
166+
print("Latest version already installed. Skipping extraction")
167+
return True
168+
169+
if verbose:
170+
print("New version detected")
171+
172+
except Exception as e:
173+
if verbose:
174+
print(f"Falied to verify version for {rename_to}: {e}")
175+
176+
return False
177+
178+
179+
def unpack(filename, destination, force_extract, checksum): # noqa: C901
151180
dirname = ""
152181
cfile = None # Compressed file
153182
file_is_corrupted = False
@@ -196,11 +225,11 @@ def unpack(filename, destination, force_extract): # noqa: C901
196225
rename_to = "esp32-arduino-libs"
197226

198227
if not force_extract:
199-
if verify_files(filename, destination, rename_to):
200-
print(" Files ok. Skipping Extraction")
201-
return True
202-
else:
203-
print(" Extracting archive...")
228+
if is_latest_version(destination, dirname, rename_to, cfile, checksum):
229+
if verify_files(filename, destination, rename_to):
230+
print(" Files ok. Skipping Extraction")
231+
return True
232+
print(" Extracting archive...")
204233
else:
205234
print(" Forcing extraction")
206235

@@ -225,6 +254,9 @@ def unpack(filename, destination, force_extract): # noqa: C901
225254
shutil.rmtree(rename_to)
226255
shutil.move(dirname, rename_to)
227256

257+
with open(os.path.join(destination, rename_to, ".package_checksum"), "w") as f:
258+
f.write(checksum)
259+
228260
if verify_files(filename, destination, rename_to):
229261
print(" Files extracted successfully.")
230262
return True
@@ -324,11 +356,11 @@ def get_tool(tool, force_download, force_extract):
324356
print("Tool {0} already downloaded".format(archive_name))
325357
sys.stdout.flush()
326358

327-
if "esp32-arduino-libs" not in archive_name and sha256sum(local_path) != checksum:
359+
if sha256sum(local_path) != checksum:
328360
print("Checksum mismatch for {0}".format(archive_name))
329361
return False
330362

331-
return unpack(local_path, ".", force_extract)
363+
return unpack(local_path, ".", force_extract, checksum)
332364

333365

334366
def load_tools_list(filename, platform):
@@ -379,21 +411,17 @@ def identify_platform():
379411
if __name__ == "__main__":
380412
parser = argparse.ArgumentParser(description="Download and extract tools")
381413

382-
parser.add_argument("-v", "--verbose", type=bool, default=False, required=False, help="Print verbose output")
414+
parser.add_argument("-v", "--verbose", action="store_true", required=False, help="Print verbose output")
383415

384-
parser.add_argument(
385-
"-d", "--force_download", type=bool, default=False, required=False, help="Force download of tools"
386-
)
416+
parser.add_argument("-d", "--force_download", action="store_true", required=False, help="Force download of tools")
387417

388-
parser.add_argument(
389-
"-e", "--force_extract", type=bool, default=False, required=False, help="Force extraction of tools"
390-
)
418+
parser.add_argument("-e", "--force_extract", action="store_true", required=False, help="Force extraction of tools")
391419

392420
parser.add_argument(
393-
"-f", "--force_all", type=bool, default=False, required=False, help="Force download and extraction of tools"
421+
"-f", "--force_all", action="store_true", required=False, help="Force download and extraction of tools"
394422
)
395423

396-
parser.add_argument("-t", "--test", type=bool, default=False, required=False, help=argparse.SUPPRESS)
424+
parser.add_argument("-t", "--test", action="store_true", required=False, help=argparse.SUPPRESS)
397425

398426
args = parser.parse_args()
399427

0 commit comments

Comments
 (0)