pxt-core 13.1.2 → 13.1.4

package/built/cli.js

@@ -841,6 +841,9 @@ function gitUploadAsync(opts, uplReqs) {
     });
 }
 async function uploadToGitRepoAsync(opts, uplReqs) {
+    if (process.env["PXT_SKIP_GIT_COMMIT"]) {
+        return writeFilesToPushAsync(opts, uplReqs);
+    }
     let label = opts.label;
     if (!label) {
         console.log('no label; skip release upload');
@@ -941,6 +944,40 @@ async function uploadToGitRepoAsync(opts, uplReqs) {
         }
     });
 }
+async function writeFilesToPushAsync(opts, uplReqs) {
+    let label = opts.label;
+    if (!label) {
+        console.log('no label; skip release upload');
+        return Promise.resolve();
+    }
+    let tid = pxt.appTarget.id;
+    if (U.startsWith(label, tid + "/"))
+        label = label.slice(tid.length + 1);
+    if (!/^v\d/.test(label)) {
+        console.log(`label "${label}" is not a version; skipping release upload`);
+        return Promise.resolve();
+    }
+    const releasesDir = path.resolve("tmp/releases");
+    const outDir = path.join(releasesDir, "built");
+    console.log("writing release files to " + releasesDir);
+    nodeutil.mkdirP(outDir);
+    const info = await ciBuildInfoAsync();
+    const releaseInfo = {
+        url: info.commitUrl,
+        tag: label
+    };
+    // this gets read by the github actions workflow
+    fs.writeFileSync(path.join(releasesDir, "release.json"), JSON.stringify(releaseInfo, null, 2), { encoding: "utf8" });
+    // copy the files into the built directory. the actual push to the git repo will be
+    // handled by the github actions workflow
+    for (let u of U.values(uplReqs)) {
+        let fpath = path.join(outDir, u.filename);
+        nodeutil.mkdirP(path.dirname(fpath));
+        fs.writeFileSync(fpath, u.content, { encoding: u.encoding });
+    }
+    // make sure there's always something to commit
+    fs.writeFileSync(path.join(outDir, "stamp.txt"), new Date().toString());
+}
 function uploadedArtFileCdnUrl(fn) {
     if (!fn || /^(https?|data):/.test(fn))
         return fn; // nothing to do

package/built/pxt.js

@@ -120947,6 +120947,8 @@ ${code}
         tutorial_1.shouldFilterProject = shouldFilterProject;
         function mergeTutorialDependencies(projectDependencies, tutorialDependencies) {
             const merged = Object.assign({}, projectDependencies);
+            if (!tutorialDependencies)
+                return merged;
             for (const dep of Object.keys(tutorialDependencies)) {
                 const ver = tutorialDependencies[dep];
                 if (ver.toLowerCase() === "remove") {
@@ -165002,6 +165004,9 @@ function gitUploadAsync(opts, uplReqs) {
     });
 }
 async function uploadToGitRepoAsync(opts, uplReqs) {
+    if (process.env["PXT_SKIP_GIT_COMMIT"]) {
+        return writeFilesToPushAsync(opts, uplReqs);
+    }
     let label = opts.label;
     if (!label) {
         console.log('no label; skip release upload');
@@ -165102,6 +165107,40 @@ async function uploadToGitRepoAsync(opts, uplReqs) {
         }
     });
 }
+async function writeFilesToPushAsync(opts, uplReqs) {
+    let label = opts.label;
+    if (!label) {
+        console.log('no label; skip release upload');
+        return Promise.resolve();
+    }
+    let tid = pxt.appTarget.id;
+    if (U.startsWith(label, tid + "/"))
+        label = label.slice(tid.length + 1);
+    if (!/^v\d/.test(label)) {
+        console.log(`label "${label}" is not a version; skipping release upload`);
+        return Promise.resolve();
+    }
+    const releasesDir = path.resolve("tmp/releases");
+    const outDir = path.join(releasesDir, "built");
+    console.log("writing release files to " + releasesDir);
+    nodeutil.mkdirP(outDir);
+    const info = await ciBuildInfoAsync();
+    const releaseInfo = {
+        url: info.commitUrl,
+        tag: label
+    };
+    // this gets read by the github actions workflow
+    fs.writeFileSync(path.join(releasesDir, "release.json"), JSON.stringify(releaseInfo, null, 2), { encoding: "utf8" });
+    // copy the files into the built directory. the actual push to the git repo will be
+    // handled by the github actions workflow
+    for (let u of U.values(uplReqs)) {
+        let fpath = path.join(outDir, u.filename);
+        nodeutil.mkdirP(path.dirname(fpath));
+        fs.writeFileSync(fpath, u.content, { encoding: u.encoding });
+    }
+    // make sure there's always something to commit
+    fs.writeFileSync(path.join(outDir, "stamp.txt"), new Date().toString());
+}
 function uploadedArtFileCdnUrl(fn) {
     if (!fn || /^(https?|data):/.test(fn))
         return fn; // nothing to do

package/built/pxtlib.js

@@ -23226,6 +23226,8 @@ ${code}
         tutorial_1.shouldFilterProject = shouldFilterProject;
         function mergeTutorialDependencies(projectDependencies, tutorialDependencies) {
             const merged = Object.assign({}, projectDependencies);
+            if (!tutorialDependencies)
+                return merged;
             for (const dep of Object.keys(tutorialDependencies)) {
                 const ver = tutorialDependencies[dep];
                 if (ver.toLowerCase() === "remove") {