Bump tools and Risc-V toolchain version to v2.0.0-5

Fixes #90
raspberrypi · Sep 30, 2024 · 1ae2b0d · 1ae2b0d
1 parent e594124
commit 1ae2b0d
Show file tree

Hide file tree

Showing 5 changed files with 103 additions and 6 deletions.
diff --git a/data/0.17.0/github-cache.json b/data/0.17.0/github-cache.json
@@ -266,7 +266,8 @@
     "v2.0.0-1",
     "v2.0.0-2",
     "v2.0.0-3",
-    "v2.0.0-4"
+    "v2.0.0-4",
+    "v2.0.0-5"
   ],
   "githubApiCache-3-1-v1.5.1-0": {
     "assets": [
@@ -683,6 +684,96 @@
     ],
     "assetsUrl": "https://api.github.com/repos/raspberrypi/pico-sdk-tools/releases/175505012/assets"
   },
+  "githubApiCache-3-1-v2.0.0-5": {
+    "assets": [
+      {
+        "id": 195382918,
+        "name": "openocd-0.12.0+dev-aarch64-lin.tar.gz",
+        "browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/openocd-0.12.0%2Bdev-aarch64-lin.tar.gz"
+      },
+      {
+        "id": 195377190,
+        "name": "openocd-0.12.0+dev-arm64-mac.zip",
+        "browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/openocd-0.12.0%2Bdev-arm64-mac.zip"
+      },
+      {
+        "id": 195372506,
+        "name": "openocd-0.12.0+dev-x64-win.zip",
+        "browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/openocd-0.12.0%2Bdev-x64-win.zip"
+      },
+      {
+        "id": 195376538,
+        "name": "openocd-0.12.0+dev-x86_64-lin.tar.gz",
+        "browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/openocd-0.12.0%2Bdev-x86_64-lin.tar.gz"
+      },
+      {
+        "id": 195382919,
+        "name": "pico-sdk-tools-2.0.0-aarch64-lin.tar.gz",
+        "browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/pico-sdk-tools-2.0.0-aarch64-lin.tar.gz"
+      },
+      {
+        "id": 195377173,
+        "name": "pico-sdk-tools-2.0.0-mac.zip",
+        "browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/pico-sdk-tools-2.0.0-mac.zip"
+      },
+      {
+        "id": 195372508,
+        "name": "pico-sdk-tools-2.0.0-x64-win.zip",
+        "browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/pico-sdk-tools-2.0.0-x64-win.zip"
+      },
+      {
+        "id": 195376540,
+        "name": "pico-sdk-tools-2.0.0-x86_64-lin.tar.gz",
+        "browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/pico-sdk-tools-2.0.0-x86_64-lin.tar.gz"
+      },
+      {
+        "id": 195382917,
+        "name": "picotool-2.0.0-aarch64-lin.tar.gz",
+        "browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/picotool-2.0.0-aarch64-lin.tar.gz"
+      },
+      {
+        "id": 195377172,
+        "name": "picotool-2.0.0-mac.zip",
+        "browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/picotool-2.0.0-mac.zip"
+      },
+      {
+        "id": 195372507,
+        "name": "picotool-2.0.0-x64-win.zip",
+        "browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/picotool-2.0.0-x64-win.zip"
+      },
+      {
+        "id": 195376539,
+        "name": "picotool-2.0.0-x86_64-lin.tar.gz",
+        "browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/picotool-2.0.0-x86_64-lin.tar.gz"
+      },
+      {
+        "id": 195382920,
+        "name": "riscv-toolchain-14-aarch64-lin.tar.gz",
+        "browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/riscv-toolchain-14-aarch64-lin.tar.gz"
+      },
+      {
+        "id": 195377191,
+        "name": "riscv-toolchain-14-arm64-mac.zip",
+        "browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/riscv-toolchain-14-arm64-mac.zip"
+      },
+      {
+        "id": 195377189,
+        "name": "riscv-toolchain-14-x64-mac.zip",
+        "browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/riscv-toolchain-14-x64-mac.zip"
+      },
+      {
+        "id": 195377188,
+        "name": "riscv-toolchain-14-x64-win.zip",
+        "browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/riscv-toolchain-14-x64-win.zip"
+      },
+      {
+        "id": 195376542,
+        "name": "riscv-toolchain-14-x86_64-lin.tar.gz",
+        "browser_download_url": "https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/riscv-toolchain-14-x86_64-lin.tar.gz"
+      }
+    ],
+    "assetsUrl": "https://api.github.com/repos/raspberrypi/pico-sdk-tools/releases/177327402/assets"
+  },
   "githubApiCache-4-0": [
     "2.0.0"
   ],

diff --git a/data/0.17.0/supportedToolchains.ini b/data/0.17.0/supportedToolchains.ini
@@ -10,6 +10,12 @@ darwin_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/g
 darwin_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-darwin-x86_64-arm-none-eabi.tar.xz
 linux_x64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz
 linux_arm64 = https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-aarch64-arm-none-eabi.tar.xz
+[RISCV_RPI_2_0_0_5]
+win32_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/riscv-toolchain-14-x64-win.zip
+darwin_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/riscv-toolchain-14-arm64-mac.zip
+darwin_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/riscv-toolchain-14-x64-mac.zip
+linux_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/riscv-toolchain-14-x86_64-lin.tar.gz
+linux_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-5/riscv-toolchain-14-aarch64-lin.tar.gz
 [RISCV_RPI_2_0_0_2]
 win32_x64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-2/riscv-toolchain-14-x64-win.zip
 darwin_arm64 = https://github.com/raspberrypi/pico-sdk-tools/releases/download/v2.0.0-2/riscv-toolchain-14-arm64-mac.zip

diff --git a/data/0.17.0/versionBundles.json b/data/0.17.0/versionBundles.json
@@ -18,6 +18,6 @@
     "cmake": "v3.28.6",
     "picotool": "2.0.0",
     "toolchain": "13_2_Rel1",
-    "riscvToolchain": "RISCV_RPI_2_0_0_2"
+    "riscvToolchain": "RISCV_RPI_2_0_0_5"
   }
 }
diff --git a/scripts/genCache.py b/scripts/genCache.py
@@ -50,7 +50,7 @@
     ["1.5.1", "2.0.0"],
     ["v3.28.6", "v3.29.6"],
     ["v1.12.1"],
-    ["v1.5.1-0", "v2.0.0-0", "v2.0.0-1", "v2.0.0-2", "v2.0.0-3", "v2.0.0-4"],
+    ["v1.5.1-0", "v2.0.0-0", "v2.0.0-1", "v2.0.0-2", "v2.0.0-3", "v2.0.0-4", "v2.0.0-5"],
     ["2.0.0"]
 ]
 

diff --git a/src/utils/download.mts b/src/utils/download.mts
@@ -66,19 +66,19 @@ const TOOLS_RELEASES: { [key: string]: string } = {
   // eslint-disable-next-line @typescript-eslint/naming-convention
   "1.5.1": "v1.5.1-0",
   // eslint-disable-next-line @typescript-eslint/naming-convention
-  "2.0.0": "v2.0.0-4",
+  "2.0.0": "v2.0.0-5",
 };
 
 /// Release tags for picotool
 const PICOTOOL_RELEASES: { [key: string]: string } = {
   // eslint-disable-next-line @typescript-eslint/naming-convention
-  "2.0.0": "v2.0.0-4",
+  "2.0.0": "v2.0.0-5",
 };
 
 /// Release tags for openocd
 const OPENOCD_RELEASES: { [key: string]: string } = {
   // eslint-disable-next-line @typescript-eslint/naming-convention
-  "0.12.0+dev": "v2.0.0-4",
+  "0.12.0+dev": "v2.0.0-5",
 };
 
 /// Translate nodejs platform names to cmake platform names