Add support for multiple release versions in the cache

Signed-off-by: William Vinnicombe <[email protected]>

diff --git a/data/0.10.0/github-cache.json b/data/0.10.0/github-cache.json
index 04430bbbebb382089c7820ff29f67d4ccd04e369..2f714b6f52c54ace276c2ea49af29d8bb7c087c8 100644 (file)
--- a/data/0.10.0/github-cache.json
+++ b/data/0.10.0/github-cache.json
@@ -2,7 +2,7 @@
   "githubApiCache-0-0": [
     "1.5.1"
   ],
-  "githubApiCache-0-1": {
+  "githubApiCache-0-1-1.5.1": {
     "assets": [
       {
         "id": 112935743,
@@ -13,112 +13,213 @@
     "assetsUrl": "https://api.github.com/repos/raspberrypi/pico-sdk/releases/107707260/assets"
   },
   "githubApiCache-1-0": [
-    "v3.28.0-rc6"
+    "v3.28.6",
+    "v3.29.6"
   ],
-  "githubApiCache-1-1": {
+  "githubApiCache-1-1-v3.28.6": {
     "assets": [
       {
-        "id": 138286886,
-        "name": "cmake-3.28.0-rc6-files-v1.json",
-        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.0-rc6/cmake-3.28.0-rc6-files-v1.json"
+        "id": 171682637,
+        "name": "cmake-3.28.6-files-v1.json",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.6/cmake-3.28.6-files-v1.json"
       },
       {
-        "id": 138286887,
-        "name": "cmake-3.28.0-rc6-linux-aarch64.sh",
-        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.0-rc6/cmake-3.28.0-rc6-linux-aarch64.sh"
+        "id": 171682639,
+        "name": "cmake-3.28.6-linux-aarch64.sh",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.6/cmake-3.28.6-linux-aarch64.sh"
       },
       {
-        "id": 138286891,
-        "name": "cmake-3.28.0-rc6-linux-aarch64.tar.gz",
-        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.0-rc6/cmake-3.28.0-rc6-linux-aarch64.tar.gz"
+        "id": 171682797,
+        "name": "cmake-3.28.6-linux-aarch64.tar.gz",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.6/cmake-3.28.6-linux-aarch64.tar.gz"
       },
       {
-        "id": 138286893,
-        "name": "cmake-3.28.0-rc6-linux-x86_64.sh",
-        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.0-rc6/cmake-3.28.0-rc6-linux-x86_64.sh"
+        "id": 171682872,
+        "name": "cmake-3.28.6-linux-x86_64.sh",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.6/cmake-3.28.6-linux-x86_64.sh"
       },
       {
-        "id": 138286897,
-        "name": "cmake-3.28.0-rc6-linux-x86_64.tar.gz",
-        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.0-rc6/cmake-3.28.0-rc6-linux-x86_64.tar.gz"
+        "id": 171682906,
+        "name": "cmake-3.28.6-linux-x86_64.tar.gz",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.6/cmake-3.28.6-linux-x86_64.tar.gz"
       },
       {
-        "id": 138286903,
-        "name": "cmake-3.28.0-rc6-macos-universal.dmg",
-        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.0-rc6/cmake-3.28.0-rc6-macos-universal.dmg"
+        "id": 171682946,
+        "name": "cmake-3.28.6-macos-universal.dmg",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.6/cmake-3.28.6-macos-universal.dmg"
       },
       {
-        "id": 138286905,
-        "name": "cmake-3.28.0-rc6-macos-universal.tar.gz",
-        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.0-rc6/cmake-3.28.0-rc6-macos-universal.tar.gz"
+        "id": 171683083,
+        "name": "cmake-3.28.6-macos-universal.tar.gz",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.6/cmake-3.28.6-macos-universal.tar.gz"
       },
       {
-        "id": 138286910,
-        "name": "cmake-3.28.0-rc6-macos10.10-universal.dmg",
-        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.0-rc6/cmake-3.28.0-rc6-macos10.10-universal.dmg"
+        "id": 171683266,
+        "name": "cmake-3.28.6-macos10.10-universal.dmg",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.6/cmake-3.28.6-macos10.10-universal.dmg"
       },
       {
-        "id": 138286923,
-        "name": "cmake-3.28.0-rc6-macos10.10-universal.tar.gz",
-        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.0-rc6/cmake-3.28.0-rc6-macos10.10-universal.tar.gz"
+        "id": 171683323,
+        "name": "cmake-3.28.6-macos10.10-universal.tar.gz",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.6/cmake-3.28.6-macos10.10-universal.tar.gz"
       },
       {
-        "id": 138286925,
-        "name": "cmake-3.28.0-rc6-SHA-256.txt",
-        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.0-rc6/cmake-3.28.0-rc6-SHA-256.txt"
+        "id": 171683404,
+        "name": "cmake-3.28.6-SHA-256.txt",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.6/cmake-3.28.6-SHA-256.txt"
       },
       {
-        "id": 138286926,
-        "name": "cmake-3.28.0-rc6-SHA-256.txt.asc",
-        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.0-rc6/cmake-3.28.0-rc6-SHA-256.txt.asc"
+        "id": 171683405,
+        "name": "cmake-3.28.6-SHA-256.txt.asc",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.6/cmake-3.28.6-SHA-256.txt.asc"
       },
       {
-        "id": 138286927,
-        "name": "cmake-3.28.0-rc6-windows-arm64.msi",
-        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.0-rc6/cmake-3.28.0-rc6-windows-arm64.msi"
+        "id": 171683406,
+        "name": "cmake-3.28.6-windows-arm64.msi",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.6/cmake-3.28.6-windows-arm64.msi"
       },
       {
-        "id": 138286932,
-        "name": "cmake-3.28.0-rc6-windows-arm64.zip",
-        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.0-rc6/cmake-3.28.0-rc6-windows-arm64.zip"
+        "id": 171683440,
+        "name": "cmake-3.28.6-windows-arm64.zip",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.6/cmake-3.28.6-windows-arm64.zip"
       },
       {
-        "id": 138286933,
-        "name": "cmake-3.28.0-rc6-windows-i386.msi",
-        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.0-rc6/cmake-3.28.0-rc6-windows-i386.msi"
+        "id": 171683535,
+        "name": "cmake-3.28.6-windows-i386.msi",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.6/cmake-3.28.6-windows-i386.msi"
       },
       {
-        "id": 138286934,
-        "name": "cmake-3.28.0-rc6-windows-i386.zip",
-        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.0-rc6/cmake-3.28.0-rc6-windows-i386.zip"
+        "id": 171683624,
+        "name": "cmake-3.28.6-windows-i386.zip",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.6/cmake-3.28.6-windows-i386.zip"
       },
       {
-        "id": 138286935,
-        "name": "cmake-3.28.0-rc6-windows-x86_64.msi",
-        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.0-rc6/cmake-3.28.0-rc6-windows-x86_64.msi"
+        "id": 171683745,
+        "name": "cmake-3.28.6-windows-x86_64.msi",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.6/cmake-3.28.6-windows-x86_64.msi"
       },
       {
-        "id": 138286937,
-        "name": "cmake-3.28.0-rc6-windows-x86_64.zip",
-        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.0-rc6/cmake-3.28.0-rc6-windows-x86_64.zip"
+        "id": 171683767,
+        "name": "cmake-3.28.6-windows-x86_64.zip",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.6/cmake-3.28.6-windows-x86_64.zip"
       },
       {
-        "id": 138286939,
-        "name": "cmake-3.28.0-rc6.tar.gz",
-        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.0-rc6/cmake-3.28.0-rc6.tar.gz"
+        "id": 171683790,
+        "name": "cmake-3.28.6.tar.gz",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.6/cmake-3.28.6.tar.gz"
       },
       {
-        "id": 138286941,
-        "name": "cmake-3.28.0-rc6.zip",
-        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.0-rc6/cmake-3.28.0-rc6.zip"
+        "id": 171683796,
+        "name": "cmake-3.28.6.zip",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.28.6/cmake-3.28.6.zip"
       }
     ],
-    "assetsUrl": "https://api.github.com/repos/Kitware/CMake/releases/132188415/assets"
+    "assetsUrl": "https://api.github.com/repos/Kitware/CMake/releases/158667625/assets"
+  },
+  "githubApiCache-1-1-v3.29.6": {
+    "assets": [
+      {
+        "id": 174341995,
+        "name": "cmake-3.29.6-files-v1.json",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-files-v1.json"
+      },
+      {
+        "id": 174341999,
+        "name": "cmake-3.29.6-linux-aarch64.sh",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-linux-aarch64.sh"
+      },
+      {
+        "id": 174342062,
+        "name": "cmake-3.29.6-linux-aarch64.tar.gz",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-linux-aarch64.tar.gz"
+      },
+      {
+        "id": 174342111,
+        "name": "cmake-3.29.6-linux-x86_64.sh",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-linux-x86_64.sh"
+      },
+      {
+        "id": 174347312,
+        "name": "cmake-3.29.6-linux-x86_64.tar.gz",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-linux-x86_64.tar.gz"
+      },
+      {
+        "id": 174342299,
+        "name": "cmake-3.29.6-macos-universal.dmg",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-macos-universal.dmg"
+      },
+      {
+        "id": 174342411,
+        "name": "cmake-3.29.6-macos-universal.tar.gz",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-macos-universal.tar.gz"
+      },
+      {
+        "id": 174342498,
+        "name": "cmake-3.29.6-macos10.10-universal.dmg",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-macos10.10-universal.dmg"
+      },
+      {
+        "id": 174342661,
+        "name": "cmake-3.29.6-macos10.10-universal.tar.gz",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-macos10.10-universal.tar.gz"
+      },
+      {
+        "id": 174342833,
+        "name": "cmake-3.29.6-SHA-256.txt",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-SHA-256.txt"
+      },
+      {
+        "id": 174342839,
+        "name": "cmake-3.29.6-SHA-256.txt.asc",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-SHA-256.txt.asc"
+      },
+      {
+        "id": 174342841,
+        "name": "cmake-3.29.6-windows-arm64.msi",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-windows-arm64.msi"
+      },
+      {
+        "id": 174342900,
+        "name": "cmake-3.29.6-windows-arm64.zip",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-windows-arm64.zip"
+      },
+      {
+        "id": 174342965,
+        "name": "cmake-3.29.6-windows-i386.msi",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-windows-i386.msi"
+      },
+      {
+        "id": 174342982,
+        "name": "cmake-3.29.6-windows-i386.zip",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-windows-i386.zip"
+      },
+      {
+        "id": 174343004,
+        "name": "cmake-3.29.6-windows-x86_64.msi",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-windows-x86_64.msi"
+      },
+      {
+        "id": 174343044,
+        "name": "cmake-3.29.6-windows-x86_64.zip",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6-windows-x86_64.zip"
+      },
+      {
+        "id": 174343086,
+        "name": "cmake-3.29.6.tar.gz",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6.tar.gz"
+      },
+      {
+        "id": 174343102,
+        "name": "cmake-3.29.6.zip",
+        "browser_download_url": "https://github.com/Kitware/CMake/releases/download/v3.29.6/cmake-3.29.6.zip"
+      }
+    ],
+    "assetsUrl": "https://api.github.com/repos/Kitware/CMake/releases/160931478/assets"
   },
   "githubApiCache-2-0": [
     "v1.12.1"
   ],
-  "githubApiCache-2-1": {
+  "githubApiCache-2-1-v1.12.1": {
     "assets": [
       {
         "id": 167333823,
@@ -151,7 +252,7 @@
   "githubApiCache-3-0": [
     "v1.5.1-alpha-1"
   ],
-  "githubApiCache-3-1": {
+  "githubApiCache-3-1-v1.5.1-alpha-1": {
     "assets": [
       {
         "id": 141973997,
@@ -174,7 +275,7 @@
   "githubApiCache-4-0": [
     "v0.12.0-2"
   ],
-  "githubApiCache-4-1": {
+  "githubApiCache-4-1-v0.12.0-2": {
     "assets": [
       {
         "id": 124558743,

diff --git a/data/0.10.0/versionBundles.json b/data/0.10.0/versionBundles.json
index aeef32ca603fadc132789cc40008085631c8e0ed..391bf82c1b82b8ee233df14d44affe37cbc5784f 100644 (file)
--- a/data/0.10.0/versionBundles.json
+++ b/data/0.10.0/versionBundles.json
@@ -6,7 +6,7 @@
       "windowsAmd64": "https://www.python.org/ftp/python/3.9.13/python-3.9.13-embed-amd64.zip"
     },
     "ninja": "v1.12.1",
-    "cmake": "v3.28.0-rc6",
+    "cmake": "v3.28.6",
     "toolchain": "12_3_Rel1"
   },
   "1.5.1": {
@@ -16,7 +16,7 @@
       "windowsAmd64": "https://www.python.org/ftp/python/3.12.1/python-3.12.1-embed-amd64.zip"
     },
     "ninja": "v1.12.1",
-    "cmake": "v3.28.0-rc6",
+    "cmake": "v3.28.6",
     "toolchain": "13_2_Rel1"
   }
 }

diff --git a/scripts/genCache.py b/scripts/genCache.py
index 523b2d690f0ff016919d4cbbe0309ae5babb3a05..d9801b58f48b761fafd4200188eca6edb79aba85 100644 (file)
--- a/scripts/genCache.py
+++ b/scripts/genCache.py
@@ -47,11 +47,11 @@ print("Num repos", num_repos)
 
 # Only provide data for these versions
 versions = [
-    "1.5.1",
-    "v3.28.0-rc6",
-    "v1.12.1",
-    "v1.5.1-alpha-1",
-    "v0.12.0-2",
+    ["1.5.1"],
+    ["v3.28.6", "v3.29.6"],
+    ["v1.12.1"],
+    ["v1.5.1-alpha-1"],
+    ["v0.12.0-2"],
 ]
 
 headers = {
@@ -62,29 +62,29 @@ headers = {
 
 ret = {}
 for repo in range(num_repos):
-    ret[f"githubApiCache-{repo}-0"] = [versions[repo]]
-
-    version = versions[repo]
-    owner = stuff.ownerOfRepository(repo)
-    name = stuff.repoNameOfRepository(repo)
-    x = requests.get(
-        f"{stuff.GITHUB_API_BASE_URL}/repos/{owner}/{name}/releases/tags/{version}",
-        headers=headers
-    )
-    data = json.loads(x.content)
-    assets = []
-    for asset in data["assets"]:
-        assets.append({
-            "id": asset["id"],
-            "name": asset["name"],
-            "browser_download_url": asset["browser_download_url"]
-        })
-    data = {
-        "assets": assets,
-        "assetsUrl": data["assets_url"]
-    }
-
-    ret[f"githubApiCache-{repo}-1"] = data
+    ret[f"githubApiCache-{repo}-0"] = versions[repo]
+
+    for version in versions[repo]:
+        owner = stuff.ownerOfRepository(repo)
+        name = stuff.repoNameOfRepository(repo)
+        x = requests.get(
+            f"{stuff.GITHUB_API_BASE_URL}/repos/{owner}/{name}/releases/tags/{version}",
+            headers=headers
+        )
+        data = json.loads(x.content)
+        assets = []
+        for asset in data["assets"]:
+            assets.append({
+                "id": asset["id"],
+                "name": asset["name"],
+                "browser_download_url": asset["browser_download_url"]
+            })
+        data = {
+            "assets": assets,
+            "assetsUrl": data["assets_url"]
+        }
+
+        ret[f"githubApiCache-{repo}-1-{version}"] = data
         
 
 for k, v in ret.items():

diff --git a/src/utils/githubApiCache.mts b/src/utils/githubApiCache.mts
index 3a7b8e8755e1c0156e0edb118d83b4496f849646..913311e33032df288897444e2d07ceb232758c62 100644 (file)
--- a/src/utils/githubApiCache.mts
+++ b/src/utils/githubApiCache.mts
@@ -59,7 +59,8 @@ function parseCacheJson(
 
 export async function defaultCacheOfRepository(
   repository: GithubRepository,
-  dataType: GithubApiCacheEntryDataType
+  dataType: GithubApiCacheEntryDataType,
+  tag?: string
 ): Promise<GithubApiCacheEntry | undefined> {
   const ret: GithubApiCacheEntry = {
     repository: repository,
@@ -122,7 +123,10 @@ export async function defaultCacheOfRepository(
     // TODO: Logger.debug
     Logger.log(`Successfully downloaded github cache from the internet.`);
 
-    ret.data = result[`githubApiCache-${repository}-${dataType}`];
+    ret.data = result[
+      `githubApiCache-${repository}-${dataType}`
+      + `${tag !== undefined ? '-' + tag : ''}`
+    ];
 
     return ret;
   } catch (error) {
@@ -135,7 +139,10 @@ export async function defaultCacheOfRepository(
         joinPosix(getDataRoot(), "github-cache.json")
       );
       const parsed = parseCacheJson(cacheFile.toString("utf-8"));
-      ret.data = parsed[`githubApiCache-${repository}-${dataType}`];
+      ret.data = parsed[
+        `githubApiCache-${repository}-${dataType}`
+        + `${tag !== undefined ? '-' + tag : ''}`
+      ];
 
       return ret;
     } catch (e) {
@@ -198,6 +205,7 @@ export default class GithubApiCache {
     repository: GithubRepository,
     dataType: GithubApiCacheEntryDataType,
     data: GithubReleaseResponse | string[],
+    tag?: string,
     etag?: string
   ): Promise<void> {
     if (etag === undefined) {
@@ -207,19 +215,25 @@ export default class GithubApiCache {
       return;
     }
 
-    await this.globalState.update(`githubApiCache-${repository}-${dataType}`, {
-      repository,
-      dataType,
-      data,
-      etag,
+    await this.globalState.update(
+      `githubApiCache-${repository}-${dataType}`
+      + `${tag !== undefined ? '-' + tag : ''}`, {
+        repository,
+        dataType,
+        data,
+        etag,
     } as GithubApiCacheEntry);
   }
 
   public async getResponse(
     repository: GithubRepository,
-    dataType: GithubApiCacheEntryDataType
+    dataType: GithubApiCacheEntryDataType,
+    tag?: string
   ): Promise<GithubApiCacheEntry | undefined> {
-    return this.globalState.get(`githubApiCache-${repository}-${dataType}`);
+    return this.globalState.get(
+      `githubApiCache-${repository}-${dataType}`
+      + `${tag !== undefined ? '-' + tag : ''}`
+    );
   }
 
   /**
@@ -232,25 +246,30 @@ export default class GithubApiCache {
    */
   public async getLastEtag(
     repository: GithubRepository,
-    dataType: GithubApiCacheEntryDataType
+    dataType: GithubApiCacheEntryDataType,
+    tag?: string
   ): Promise<string | undefined> {
-    const response = await this.getResponse(repository, dataType);
+    const response = await this.getResponse(repository, dataType, tag);
 
     return response?.etag;
   }
 
   public async getDefaultResponse(
     repository: GithubRepository,
-    dataType: GithubApiCacheEntryDataType
+    dataType: GithubApiCacheEntryDataType,
+    tag?: string
   ): Promise<GithubApiCacheEntry | undefined> {
     const lastEtag = await GithubApiCache.getInstance().getLastEtag(
       repository,
       dataType
     );
     if (lastEtag) {
-      return this.globalState.get(`githubApiCache-${repository}-${dataType}`);
+      return this.globalState.get(
+        `githubApiCache-${repository}-${dataType}`
+        + `${tag !== undefined ? '-' + tag : ''}`
+      );
     } else {
-      return defaultCacheOfRepository(repository, dataType);
+      return defaultCacheOfRepository(repository, dataType, tag);
     }
   }
 

diff --git a/src/utils/githubREST.mts b/src/utils/githubREST.mts
index 8d51e40be6c4a7494399a17089dc3bc58f1bd99f..b428ff97c83e19ebefda0fd9037a00d342ca0d73 100644 (file)
--- a/src/utils/githubREST.mts
+++ b/src/utils/githubREST.mts
@@ -190,6 +190,7 @@ async function getReleases(repository: GithubRepository): Promise<string[]> {
         repository,
         GithubApiCacheEntryDataType.releases,
         responseData,
+        undefined,
         response.headers.etag
       );
 
@@ -228,7 +229,8 @@ export async function getGithubReleaseByTag(
     const repo = repoNameOfRepository(repository);
     const lastEtag = await GithubApiCache.getInstance().getLastEtag(
       repository,
-      GithubApiCacheEntryDataType.tag
+      GithubApiCacheEntryDataType.tag,
+      tag
     );
     const headers: { [key: string]: string } = {
       // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -252,7 +254,8 @@ export async function getGithubReleaseByTag(
 
       const cachedResponse = await GithubApiCache.getInstance().getResponse(
         repository,
-        GithubApiCacheEntryDataType.tag
+        GithubApiCacheEntryDataType.tag,
+        tag
       );
       if (cachedResponse) {
         return cachedResponse.data as GithubReleaseResponse;
@@ -272,6 +275,7 @@ export async function getGithubReleaseByTag(
         repository,
         GithubApiCacheEntryDataType.tag,
         responseData,
+        tag,
         response.headers.etag
       );
 
@@ -284,7 +288,8 @@ export async function getGithubReleaseByTag(
 
     return (await GithubApiCache.getInstance().getDefaultResponse(
       repository,
-      GithubApiCacheEntryDataType.tag
+      GithubApiCacheEntryDataType.tag,
+      tag
     ))?.data as GithubReleaseResponse;
   }
 }