Skip to content

Commit 096537e

Browse files
will-v-piwill-v-pi
committed
Update to pico-sdk-tools release v2.2.0-2
Fixes #203 Also fix bug in picotool tasks.json version update
1 parent 34e817b commit 096537e

File tree

6 files changed

+108
-5
lines changed

6 files changed

+108
-5
lines changed

‎data/0.18.0/github-cache.json‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,7 @@
496496
"assetsUrl": "https://api.github.com/repos/ninja-build/ninja/releases/155357494/assets"
497497
},
498498
"githubApiCache-3-0": [
499+
"v2.2.0-2",
499500
"v2.2.0-1",
500501
"v2.2.0-0",
501502
"v2.1.1-3",
@@ -1409,6 +1410,101 @@
14091410
],
14101411
"assetsUrl": "https://api.github.com/repos/raspberrypi/pico-sdk-tools/releases/238337607/assets"
14111412
},
1413+
"githubApiCache-3-1-v2.2.0-2": {
1414+
"assets": [
1415+
{
1416+
"id": 292613519,
1417+
"name": "openocd-0.12.0+dev-aarch64-lin.tar.gz",
1418+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/openocd-0.12.0%2Bdev-aarch64-lin.tar.gz"
1419+
},
1420+
{
1421+
"id": 292605249,
1422+
"name": "openocd-0.12.0+dev-arm64-mac.zip",
1423+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/openocd-0.12.0%2Bdev-arm64-mac.zip"
1424+
},
1425+
{
1426+
"id": 292625609,
1427+
"name": "openocd-0.12.0+dev-x64-win.zip",
1428+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/openocd-0.12.0%2Bdev-x64-win.zip"
1429+
},
1430+
{
1431+
"id": 292602307,
1432+
"name": "openocd-0.12.0+dev-x86_64-lin.tar.gz",
1433+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/openocd-0.12.0%2Bdev-x86_64-lin.tar.gz"
1434+
},
1435+
{
1436+
"id": 292615519,
1437+
"name": "openocd-0.12.0+dev-x86_64-mac.zip",
1438+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/openocd-0.12.0%2Bdev-x86_64-mac.zip"
1439+
},
1440+
{
1441+
"id": 292613518,
1442+
"name": "pico-sdk-tools-2.2.0-aarch64-lin.tar.gz",
1443+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/pico-sdk-tools-2.2.0-aarch64-lin.tar.gz"
1444+
},
1445+
{
1446+
"id": 292605250,
1447+
"name": "pico-sdk-tools-2.2.0-mac.zip",
1448+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/pico-sdk-tools-2.2.0-mac.zip"
1449+
},
1450+
{
1451+
"id": 292625611,
1452+
"name": "pico-sdk-tools-2.2.0-x64-win.zip",
1453+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/pico-sdk-tools-2.2.0-x64-win.zip"
1454+
},
1455+
{
1456+
"id": 292602308,
1457+
"name": "pico-sdk-tools-2.2.0-x86_64-lin.tar.gz",
1458+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/pico-sdk-tools-2.2.0-x86_64-lin.tar.gz"
1459+
},
1460+
{
1461+
"id": 292613520,
1462+
"name": "picotool-2.2.0-a4-aarch64-lin.tar.gz",
1463+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/picotool-2.2.0-a4-aarch64-lin.tar.gz"
1464+
},
1465+
{
1466+
"id": 292605251,
1467+
"name": "picotool-2.2.0-a4-mac.zip",
1468+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/picotool-2.2.0-a4-mac.zip"
1469+
},
1470+
{
1471+
"id": 292625610,
1472+
"name": "picotool-2.2.0-a4-x64-win.zip",
1473+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/picotool-2.2.0-a4-x64-win.zip"
1474+
},
1475+
{
1476+
"id": 292602309,
1477+
"name": "picotool-2.2.0-a4-x86_64-lin.tar.gz",
1478+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/picotool-2.2.0-a4-x86_64-lin.tar.gz"
1479+
},
1480+
{
1481+
"id": 292613521,
1482+
"name": "riscv-toolchain-15-aarch64-lin.tar.gz",
1483+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/riscv-toolchain-15-aarch64-lin.tar.gz"
1484+
},
1485+
{
1486+
"id": 292605248,
1487+
"name": "riscv-toolchain-15-arm64-mac.zip",
1488+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/riscv-toolchain-15-arm64-mac.zip"
1489+
},
1490+
{
1491+
"id": 292625612,
1492+
"name": "riscv-toolchain-15-x64-win.zip",
1493+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/riscv-toolchain-15-x64-win.zip"
1494+
},
1495+
{
1496+
"id": 292602306,
1497+
"name": "riscv-toolchain-15-x86_64-lin.tar.gz",
1498+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/riscv-toolchain-15-x86_64-lin.tar.gz"
1499+
},
1500+
{
1501+
"id": 292615518,
1502+
"name": "riscv-toolchain-15-x86_64-mac.zip",
1503+
"browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/riscv-toolchain-15-x86_64-mac.zip"
1504+
}
1505+
],
1506+
"assetsUrl": "https://api.github.com/repos/raspberrypi/pico-sdk-tools/releases/246845940/assets"
1507+
},
14121508
"githubApiCache-4-0": [
14131509
"2.2.0-a4",
14141510
"2.2.0",

‎data/0.18.0/supportedToolchains.ini‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ darwin_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/g
44
darwin_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-darwin-x86_64-arm-none-eabi.tar.xz
55
linux_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi.tar.xz
66
linux_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-aarch64-arm-none-eabi.tar.xz
7+
[RISCV_ZCB_RPI_2_2_0_2]
8+
win32_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/riscv-toolchain-15-x64-win.zip
9+
darwin_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/riscv-toolchain-15-arm64-mac.zip
10+
darwin_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/riscv-toolchain-15-x86_64-mac.zip
11+
linux_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/riscv-toolchain-15-x86_64-lin.tar.gz
12+
linux_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.2.0-2/riscv-toolchain-15-aarch64-lin.tar.gz
713
[RISCV_ZCB_RPI_2_1_1_3]
814
win32_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/riscv-toolchain-15-x64-win.zip
915
darwin_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.1.1-3/riscv-toolchain-15-arm64-mac.zip

‎data/0.18.0/versionBundles.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"cmake": "v3.31.5",
5050
"picotool": "2.2.0-a4",
5151
"toolchain": "14_2_Rel1",
52-
"riscvToolchain": "RISCV_ZCB_RPI_2_1_1_3",
52+
"riscvToolchain": "RISCV_ZCB_RPI_2_2_0_2",
5353
"modifiers": {
5454
"darwin_x64": {
5555
"toolchain": "13_2_Rel1"

‎scripts/genCache.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
"v2.1.1-3",
6464
"v2.2.0-0",
6565
"v2.2.0-1",
66+
"v2.2.0-2",
6667
], # pico-sdk-tools
6768
["2.0.0", "2.1.0", "2.1.1", "2.2.0", "2.2.0-a4"], # picotool
6869
]

‎src/utils/download.mts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const TOOLS_RELEASES: { [key: string]: string } = {
7272
// eslint-disable-next-line @typescript-eslint/naming-convention
7373
"2.1.1": "v2.1.1-1",
7474
// eslint-disable-next-line @typescript-eslint/naming-convention
75-
"2.2.0": "v2.2.0-1",
75+
"2.2.0": "v2.2.0-2",
7676
};
7777

7878
/// Release tags for picotool
@@ -86,13 +86,13 @@ const PICOTOOL_RELEASES: { [key: string]: string } = {
8686
// eslint-disable-next-line @typescript-eslint/naming-convention
8787
"2.2.0": "v2.2.0-0",
8888
// eslint-disable-next-line @typescript-eslint/naming-convention
89-
"2.2.0-a4": "v2.2.0-1",
89+
"2.2.0-a4": "v2.2.0-2",
9090
};
9191

9292
/// Release tags for openocd
9393
const OPENOCD_RELEASES: { [key: string]: string } = {
9494
// eslint-disable-next-line @typescript-eslint/naming-convention
95-
"0.12.0+dev": "v2.1.1-3",
95+
"0.12.0+dev": "v2.2.0-2",
9696
};
9797

9898
/// Translate nodejs platform names to cmake platform names

‎src/utils/vscodeConfigUtil.mts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ async function updateTasksFile(
8787

8888
if (content.includes(".pico-sdk/picotool/")) {
8989
const oldPicotoolVersion =
90-
content.match(/(?<=\.pico-sdk\/picotool\/)(.*)(?=\/)/);
90+
content.match(/(?<=\.pico-sdk\/picotool\/)([^/]*)(?=\/)/);
9191
if (oldPicotoolVersion !== null) {
9292
content = content.replaceAll(
9393
`.pico-sdk/picotool/${oldPicotoolVersion[0]}`,

0 commit comments

Comments
 (0)