Skip to content

Commit 5955059

Browse files
dobairolanddobairoland
committed
Merge branch 'feat/update_tools_in_tools_json_v5.3' into 'release/v5.3'
feat(tools): Update tools: cmake, ninja, ccache (v5.3) See merge request espressif/esp-idf!33530
2 parents dbbdb0d + 2bfcfda commit 5955059

File tree

3 files changed

+69
-59
lines changed

3 files changed

+69
-59
lines changed

‎tools/test_build_system/test_rebuild.py‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
1-
# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
1+
# SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
22
# SPDX-License-Identifier: Apache-2.0
33
# These tests check whether the build system rebuilds some files or not
44
# depending on the changes to the project.
55
import logging
66
import os
77
from pathlib import Path
8-
from typing import List, Union
8+
from typing import List
9+
from typing import Union
910

1011
import pytest
11-
from test_build_system_helpers import (ALL_ARTIFACTS, APP_BINS, BOOTLOADER_BINS, PARTITION_BIN, IdfPyFunc,
12-
get_snapshot, replace_in_file)
12+
from test_build_system_helpers import ALL_ARTIFACTS
13+
from test_build_system_helpers import APP_BINS
14+
from test_build_system_helpers import BOOTLOADER_BINS
15+
from test_build_system_helpers import get_snapshot
16+
from test_build_system_helpers import IdfPyFunc
17+
from test_build_system_helpers import PARTITION_BIN
18+
from test_build_system_helpers import replace_in_file
1319

1420

1521
@pytest.mark.usefixtures('test_app_copy')
@@ -18,7 +24,9 @@ def test_rebuild_no_changes(idf_py: IdfPyFunc) -> None:
1824
idf_py('build')
1925
logging.info('get the first snapshot')
2026
# excluding the 'log' subdirectory here since it changes after every build
21-
all_build_files = get_snapshot('build/**/*', exclude_patterns='build/log/*')
27+
all_build_files = get_snapshot('build/**/*', exclude_patterns=['build/log/*',
28+
'build/CMakeFiles/bootloader-complete',
29+
'build/bootloader-prefix/src/bootloader-stamp/bootloader-done'])
2230

2331
logging.info('check that all build artifacts were generated')
2432
for artifact in ALL_ARTIFACTS:
@@ -27,7 +35,9 @@ def test_rebuild_no_changes(idf_py: IdfPyFunc) -> None:
2735
logging.info('build again with no changes')
2836
idf_py('build')
2937
# if there are no changes, nothing gets rebuilt
30-
all_build_files_after_rebuild = get_snapshot('build/**/*', exclude_patterns='build/log/*')
38+
all_build_files_after_rebuild = get_snapshot('build/**/*', exclude_patterns=['build/log/*',
39+
'build/CMakeFiles/bootloader-complete',
40+
'build/bootloader-prefix/src/bootloader-stamp/bootloader-done'])
3141
all_build_files_after_rebuild.assert_same(all_build_files)
3242

3343

‎tools/test_idf_tools/test_idf_tools.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ def test_usage_basic_win(self):
643643
self.temp_tools_dir, 'tools', IDF_EXE, IDF_EXE_VERSION
644644
), output)
645645
self.assertIn(os.path.join(
646-
self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.8-windows-x86_64'
646+
self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.10.2-windows-x86_64'
647647
), output)
648648
self.assertIn(os.path.join(
649649
self.temp_tools_dir, 'tools', DFU_UTIL, DFU_UTIL_VERSION, 'dfu-util-0.11-win64'
@@ -736,7 +736,7 @@ def test_tools_for_esp32_win(self):
736736
self.temp_tools_dir, 'tools', IDF_EXE, IDF_EXE_VERSION
737737
), output)
738738
self.assertIn(os.path.join(
739-
self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.8-windows-x86_64'
739+
self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.10.2-windows-x86_64'
740740
), output)
741741
self.assertNotIn(os.path.join(
742742
self.temp_tools_dir, 'tools', DFU_UTIL, DFU_UTIL_VERSION, 'dfu-util-0.11-win64'
@@ -795,7 +795,7 @@ def test_tools_for_esp32c3_win(self):
795795
self.temp_tools_dir, 'tools', IDF_EXE, IDF_EXE_VERSION
796796
), output)
797797
self.assertIn(os.path.join(
798-
self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.8-windows-x86_64'
798+
self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.10.2-windows-x86_64'
799799
), output)
800800
self.assertNotIn(os.path.join(
801801
self.temp_tools_dir, 'tools', DFU_UTIL, DFU_UTIL_VERSION, 'dfu-util-0.11-win64'
@@ -856,7 +856,7 @@ def test_tools_for_esp32s2_win(self):
856856
self.temp_tools_dir, 'tools', IDF_EXE, IDF_EXE_VERSION
857857
), output)
858858
self.assertIn(os.path.join(
859-
self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.8-windows-x86_64'
859+
self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.10.2-windows-x86_64'
860860
), output)
861861
self.assertIn(os.path.join(
862862
self.temp_tools_dir, 'tools', DFU_UTIL, DFU_UTIL_VERSION, 'dfu-util-0.11-win64'
@@ -919,7 +919,7 @@ def test_tools_for_esp32s3_win(self):
919919
self.temp_tools_dir, 'tools', IDF_EXE, IDF_EXE_VERSION
920920
), output)
921921
self.assertIn(os.path.join(
922-
self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.8-windows-x86_64'
922+
self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.10.2-windows-x86_64'
923923
), output)
924924
self.assertIn(os.path.join(
925925
self.temp_tools_dir, 'tools', DFU_UTIL, DFU_UTIL_VERSION, 'dfu-util-0.11-win64'
@@ -955,7 +955,7 @@ def test_tools_for_esp32p4_win(self):
955955
self.assertIn(os.path.join(self.temp_tools_dir, 'tools', CMAKE, CMAKE_VERSION, 'bin'), output)
956956
self.assertIn(os.path.join(self.temp_tools_dir, 'tools', NINJA, NINJA_VERSION), output)
957957
self.assertIn(os.path.join(self.temp_tools_dir, 'tools', IDF_EXE, IDF_EXE_VERSION), output)
958-
self.assertIn(os.path.join(self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.8-windows-x86_64'), output)
958+
self.assertIn(os.path.join(self.temp_tools_dir, 'tools', CCACHE, CCACHE_VERSION, 'ccache-4.10.2-windows-x86_64'), output)
959959
self.assertNotIn(os.path.join(self.temp_tools_dir, 'tools', XTENSA_ELF, XTENSA_ELF_VERSION, XTENSA_ELF, 'bin'), output)
960960
self.assertNotIn(os.path.join(self.temp_tools_dir, 'tools', ESP32ULP, ESP32ULP_VERSION, ESP32ULP, 'bin'), output)
961961
self.assertNotIn(os.path.join(self.temp_tools_dir, 'tools', XTENSA_ESP_GDB, XTENSA_ESP_GDB_VERSION, XTENSA_ESP_GDB, 'bin'), output)

‎tools/tools.json‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -498,46 +498,46 @@
498498
"versions": [
499499
{
500500
"linux-amd64": {
501-
"sha256": "726f88e6598523911e4bce9b059dc20b851aa77f97e4cc5573f4e42775a5c16f",
502-
"size": 47042675,
503-
"url": "https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0-linux-x86_64.tar.gz"
501+
"sha256": "cdd7fb352605cee3ae53b0e18b5929b642900e33d6b0173e19f6d4f2067ebf16",
502+
"size": 53635506,
503+
"url": "https://github.com/Kitware/CMake/releases/download/v3.30.2/cmake-3.30.2-linux-x86_64.tar.gz"
504504
},
505505
"linux-arm64": {
506-
"sha256": "50c3b8e9d3a3cde850dd1ea143df9d1ae546cbc5e74dc6d223eefc1979189651",
507-
"size": 48478082,
508-
"url": "https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0-linux-aarch64.tar.gz"
506+
"sha256": "d18f50f01b001303d21f53c6c16ff12ee3aa45df5da1899c2fe95be7426aa026",
507+
"size": 54889935,
508+
"url": "https://github.com/Kitware/CMake/releases/download/v3.30.2/cmake-3.30.2-linux-aarch64.tar.gz"
509509
},
510510
"linux-armel": {
511-
"sha256": "7dc787ef968dfef92491a4f191b8739ff70f8a649608b811c7a737b52481beb0",
512-
"size": 19811327,
513-
"url": "https://dl.espressif.com/dl/cmake/cmake-3.24.0-Linux-armv7l.tar.gz"
511+
"sha256": "446650c69ea74817a770f96446c162bb7ad24ffecaacb35fcd4845ec7d3c9099",
512+
"size": 17035042,
513+
"url": "https://dl.espressif.com/dl/cmake/cmake-3.30.2-Linux-armv7l.tar.gz"
514514
},
515515
"linux-armhf": {
516-
"sha256": "7dc787ef968dfef92491a4f191b8739ff70f8a649608b811c7a737b52481beb0",
517-
"size": 19811327,
518-
"url": "https://dl.espressif.com/dl/cmake/cmake-3.24.0-Linux-armv7l.tar.gz"
516+
"sha256": "446650c69ea74817a770f96446c162bb7ad24ffecaacb35fcd4845ec7d3c9099",
517+
"size": 17035042,
518+
"url": "https://dl.espressif.com/dl/cmake/cmake-3.30.2-Linux-armv7l.tar.gz"
519519
},
520520
"macos": {
521-
"sha256": "3e0cca74a56d9027dabb845a5a26e42ef8e8b33beb1655d6a724187a345145e4",
522-
"size": 72801419,
523-
"url": "https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0-macos-universal.tar.gz"
521+
"sha256": "c6fdda745f9ce69bca048e91955c7d043ba905d6388a62e0ff52b681ac17183c",
522+
"size": 79199037,
523+
"url": "https://github.com/Kitware/CMake/releases/download/v3.30.2/cmake-3.30.2-macos-universal.tar.gz"
524524
},
525525
"macos-arm64": {
526-
"sha256": "3e0cca74a56d9027dabb845a5a26e42ef8e8b33beb1655d6a724187a345145e4",
527-
"size": 72801419,
528-
"url": "https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0-macos-universal.tar.gz"
526+
"sha256": "c6fdda745f9ce69bca048e91955c7d043ba905d6388a62e0ff52b681ac17183c",
527+
"size": 79199037,
528+
"url": "https://github.com/Kitware/CMake/releases/download/v3.30.2/cmake-3.30.2-macos-universal.tar.gz"
529529
},
530-
"name": "3.24.0",
530+
"name": "3.30.2",
531531
"status": "recommended",
532532
"win32": {
533-
"sha256": "b1ad8c2dbf0778e3efcc9fd61cd4a962e5c1af40aabdebee3d5074bcff2e103c",
534-
"size": 40212531,
535-
"url": "https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0-windows-x86_64.zip"
533+
"sha256": "48bf4b3dc2d668c578e0884cac7878e146b036ca6b5ce4f8b5572f861b004c25",
534+
"size": 45404613,
535+
"url": "https://github.com/Kitware/CMake/releases/download/v3.30.2/cmake-3.30.2-windows-x86_64.zip"
536536
},
537537
"win64": {
538-
"sha256": "b1ad8c2dbf0778e3efcc9fd61cd4a962e5c1af40aabdebee3d5074bcff2e103c",
539-
"size": 40212531,
540-
"url": "https://github.com/Kitware/CMake/releases/download/v3.24.0/cmake-3.24.0-windows-x86_64.zip"
538+
"sha256": "48bf4b3dc2d668c578e0884cac7878e146b036ca6b5ce4f8b5572f861b004c25",
539+
"size": 45404613,
540+
"url": "https://github.com/Kitware/CMake/releases/download/v3.30.2/cmake-3.30.2-windows-x86_64.zip"
541541
}
542542
},
543543
{
@@ -681,30 +681,30 @@
681681
"versions": [
682682
{
683683
"linux-amd64": {
684-
"rename_dist": "ninja-linux-v1.11.1.zip",
685-
"sha256": "b901ba96e486dce377f9a070ed4ef3f79deb45f4ffe2938f8e7ddc69cfb3df77",
686-
"size": 119463,
687-
"url": "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-linux.zip"
684+
"rename_dist": "ninja-linux-v1.12.1.zip",
685+
"sha256": "6f98805688d19672bd699fbbfa2c2cf0fc054ac3df1f0e6a47664d963d530255",
686+
"size": 123084,
687+
"url": "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-linux.zip"
688688
},
689689
"macos": {
690-
"rename_dist": "ninja-mac-v1.11.1.zip",
691-
"sha256": "482ecb23c59ae3d4f158029112de172dd96bb0e97549c4b1ca32d8fad11f873e",
692-
"size": 277306,
693-
"url": "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-mac.zip"
690+
"rename_dist": "ninja-mac-v1.12.1.zip",
691+
"sha256": "89a287444b5b3e98f88a945afa50ce937b8ffd1dcc59c555ad9b1baf855298c9",
692+
"size": 281130,
693+
"url": "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-mac.zip"
694694
},
695695
"macos-arm64": {
696-
"rename_dist": "ninja-mac-v1.11.1.zip",
697-
"sha256": "482ecb23c59ae3d4f158029112de172dd96bb0e97549c4b1ca32d8fad11f873e",
698-
"size": 277306,
699-
"url": "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-mac.zip"
696+
"rename_dist": "ninja-mac-v1.12.1.zip",
697+
"sha256": "89a287444b5b3e98f88a945afa50ce937b8ffd1dcc59c555ad9b1baf855298c9",
698+
"size": 281130,
699+
"url": "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-mac.zip"
700700
},
701-
"name": "1.11.1",
701+
"name": "1.12.1",
702702
"status": "recommended",
703703
"win64": {
704-
"rename_dist": "ninja-win-v1.11.1.zip",
705-
"sha256": "524b344a1a9a55005eaf868d991e090ab8ce07fa109f1820d40e74642e289abc",
706-
"size": 285922,
707-
"url": "https://github.com/ninja-build/ninja/releases/download/v1.11.1/ninja-win.zip"
704+
"rename_dist": "ninja-win-v1.12.1.zip",
705+
"sha256": "f550fec705b6d6ff58f2db3c374c2277a37691678d6aba463adcbb129108467a",
706+
"size": 275425,
707+
"url": "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-win.zip"
708708
}
709709
}
710710
]
@@ -759,7 +759,7 @@
759759
"description": "Ccache (compiler cache)",
760760
"export_paths": [
761761
[
762-
"ccache-4.8-windows-x86_64"
762+
"ccache-4.10.2-windows-x86_64"
763763
]
764764
],
765765
"export_vars": {
@@ -787,12 +787,12 @@
787787
"version_regex": "ccache version ([0-9.]+)",
788788
"versions": [
789789
{
790-
"name": "4.8",
790+
"name": "4.10.2",
791791
"status": "recommended",
792792
"win64": {
793-
"sha256": "a2b3bab4bb8318ffc5b3e4074dc25636258bc7e4b51261f7d9bef8127fda8309",
794-
"size": 2005781,
795-
"url": "https://github.com/ccache/ccache/releases/download/v4.8/ccache-4.8-windows-x86_64.zip"
793+
"sha256": "6252f081876a9a9f700fae13a5aec5d0d486b28261d7f1f72ac11c7ad9df4da9",
794+
"size": 1610890,
795+
"url": "https://github.com/ccache/ccache/releases/download/v4.10.2/ccache-4.10.2-windows-x86_64.zip"
796796
}
797797
}
798798
]

0 commit comments

Comments
 (0)