From 12c93c25a3674abd70d0aa67669aa81eaf38d30f Mon Sep 17 00:00:00 2001 From: Amerlander Date: Wed, 6 Sep 2023 02:30:46 +0200 Subject: [PATCH 1/3] add alpha and add mini 3 package --- docs/alpha-ref.json | 3 +++ docs/beta-ref.json | 2 +- pxtarget.json | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 docs/alpha-ref.json diff --git a/docs/alpha-ref.json b/docs/alpha-ref.json new file mode 100644 index 000000000..58f715cc1 --- /dev/null +++ b/docs/alpha-ref.json @@ -0,0 +1,3 @@ +{ + "appref": "v" +} diff --git a/docs/beta-ref.json b/docs/beta-ref.json index 58f715cc1..4a964b936 100644 --- a/docs/beta-ref.json +++ b/docs/beta-ref.json @@ -1,3 +1,3 @@ { - "appref": "v" + "appref": "v6.0.18" } diff --git a/pxtarget.json b/pxtarget.json index afabc51de..f8f832c3c 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -12,6 +12,7 @@ "libs/core-mini-codal", "libs/mini-1", "libs/mini-2", + "libs/mini-3", "libs/radio", "libs/devices", "libs/bluetooth", From fcc8b367811bb8be989938910c1f097f4d81fcf8 Mon Sep 17 00:00:00 2001 From: Amerlander Date: Wed, 6 Sep 2023 09:16:51 +0200 Subject: [PATCH 2/3] update dependencies --- libs/core-mini-codal/pxt.json | 1 + libs/core-mini-dal/pxt.json | 1 + libs/datalogger/pxt.json | 1 + libs/flashlog/pxt.json | 3 ++- libs/settings/pxt.json | 3 +++ 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/core-mini-codal/pxt.json b/libs/core-mini-codal/pxt.json index 80d01a987..8cf3b8571 100644 --- a/libs/core-mini-codal/pxt.json +++ b/libs/core-mini-codal/pxt.json @@ -4,6 +4,7 @@ "core-mini": "file:../core-mini", "microphone": "file:../microphone" }, + "compileServiceVariant": "minicodal", "disablesVariants": [ "minidal" ], diff --git a/libs/core-mini-dal/pxt.json b/libs/core-mini-dal/pxt.json index 61e0986d2..9319c7f88 100644 --- a/libs/core-mini-dal/pxt.json +++ b/libs/core-mini-dal/pxt.json @@ -3,6 +3,7 @@ "core": "file:../core", "core-mini": "file:../core-mini" }, + "compileServiceVariant": "minidal", "disablesVariants": [ "minicodal" ], diff --git a/libs/datalogger/pxt.json b/libs/datalogger/pxt.json index b8b496453..9cc84a748 100644 --- a/libs/datalogger/pxt.json +++ b/libs/datalogger/pxt.json @@ -10,6 +10,7 @@ ], "dependencies": { "core": "file:../core", + "core-mini-codal": "file:../core-mini-codal", "flashlog": "file:../flashlog" } } \ No newline at end of file diff --git a/libs/flashlog/pxt.json b/libs/flashlog/pxt.json index 347fd23c5..90d793ac8 100644 --- a/libs/flashlog/pxt.json +++ b/libs/flashlog/pxt.json @@ -16,6 +16,7 @@ "minidal" ], "dependencies": { - "core": "file:../core" + "core": "file:../core", + "core-mini-codal": "file:../core-mini-codal" } } \ No newline at end of file diff --git a/libs/settings/pxt.json b/libs/settings/pxt.json index d93a41c3a..b15f29fb9 100644 --- a/libs/settings/pxt.json +++ b/libs/settings/pxt.json @@ -3,5 +3,8 @@ "disablesVariants": [ "minidal" ], + "dependencies": { + "core-mini-codal": "file:../core-mini-codal" + }, "additionalFilePath": "../../node_modules/pxt-common-packages/libs/settings" } \ No newline at end of file From f799dcd010f8d2763150326f4e857c70c694797b Mon Sep 17 00:00:00 2001 From: Amerlander Date: Wed, 6 Sep 2023 09:22:18 +0200 Subject: [PATCH 3/3] update dockerImage --- pxtarget.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pxtarget.json b/pxtarget.json index f8f832c3c..4a16957a6 100644 --- a/pxtarget.json +++ b/pxtarget.json @@ -150,7 +150,7 @@ "githubCorePackage": "calliope-mini/microbit", "gittag": "master-iss", "serviceId": "calliope", - "dockerImage": "pext/yotta:update-yotta3" + "dockerImage": "pext/yotta:gcc5" }, "variants": { "minidal": { @@ -179,7 +179,7 @@ "githubCorePackage": "calliope-edu/microbit-v2-samples", "gittag": "v0.2.13-calliope", "serviceId": "mbcodal2", - "dockerImage": "pext/yotta:update-yotta3", + "dockerImage": "pext/yotta:latest", "yottaConfigCompatibility": true } }