misc: Merge branch stable into develop branch

This ensures both branches are in-sync and have not diverged. Change-Id: Ib487d8596037017b9ec03d7e8a76229373c153db
2022-12-30 20:06:49 +00:00
parent fcde59b245 5fa484e2e0
commit 218b3925be
13 changed files with 190 additions and 57 deletions
--- a/src/python/gem5/resources/downloader.py
+++ b/src/python/gem5/resources/downloader.py
@@ -55,7 +55,7 @@ def _resources_json_version_required() -> str:
    """
    Specifies the version of resources.json to obtain.
    """
-    return "develop"
+    return "22.1"


 def _get_resources_json_uri() -> str: