cloudron 5.11.8 → 5.11.10

package/bin/cloudron-appstore

@@ -32,16 +32,13 @@ program.command('info')
 program.command('approve')
     .description('Approve a submitted app version')
     .option('--appstore-id <appid@version>', 'Appstore id and version')
+    .option('--no-git-push', 'Do not attempt to push to git repo')
     .action(appstoreActions.approve);
 
 program.command('notify')
     .description('Notify forum about successful app submission')
     .action(appstoreActions.notify);
 
-program.command('tag <version>')
-    .description('Tag the repo')
-    .action(appstoreActions.tag);
-
 program.command('revoke')
     .description('Revoke a published app version')
     .option('--appstore-id <appid@version>', 'Appstore id and version')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "5.11.8",
+  "version": "5.11.10",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -18,7 +18,7 @@
   "author": "Cloudron Developers <support@cloudron.io>",
   "dependencies": {
     "async": "^3.2.5",
-    "cloudron-manifestformat": "^5.24.0",
+    "cloudron-manifestformat": "^5.26.2",
     "commander": "^12.1.0",
     "debug": "^4.3.5",
     "easy-table": "^1.2.0",

package/src/appstore-actions.js

@@ -25,7 +25,6 @@ exports = module.exports = {
     revoke,
     approve,
 
-    tag,
     notify
 };
 
@@ -305,7 +304,7 @@ async function upload(localOptions, cmd) {
 
     const [repo, tag] = manifest.dockerImage.split(':');
     const [tagError, tagResponse] = await safe(superagent.get(`https://hub.docker.com/v2/repositories/${repo}/tags/${tag}`).ok(() => true));
-    if (tagError || tagResponse.statusCode !== 200) return exit(`Failed to find docker image in dockerhub. check https://hub.docker.com/r/${repo}/tags : ${requestError(tagResponse)}`);
+    if (tagError || tagResponse.statusCode !== 200) return exit(`Failed to find docker image in dockerhub. check https://hub.docker.com/r/${repo}/tags : ${tagError || requestError(tagResponse)}`);
 
     // ensure the app is known on the appstore side
     const baseDir = path.dirname(manifestFilePath);
@@ -366,9 +365,36 @@ async function approve(localOptions, cmd) {
 
     console.log(`Approving ${appstoreId}@${version}`);
 
+    let defaultBranch, latestTag;
+    if (options.gitPush) {
+        // Git repo pre-flight checks: checking if latest tag matches latest commit
+        defaultBranch = safe.child_process.execSync(`git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@'`, { encoding: 'utf8' });
+        if (safe.error) return exit(`Failed to get default branch: ${safe.error.message}`);
+        defaultBranch = defaultBranch.trim();
+
+        let defaultBranchSha = safe.child_process.execSync(`git rev-parse ${defaultBranch}`, { encoding: 'utf8' });
+        if (safe.error) return exit(`Failed to get head of ${defaultBranch}: ${safe.error.message}`);
+        defaultBranchSha = defaultBranchSha.trim();
+
+        latestTag = safe.child_process.execSync('git describe --tags --abbrev=0', { encoding: 'utf8' });
+        if (safe.error) return exit(`Failed to get latest tag: ${safe.error.message}`);
+        latestTag = latestTag.trim();
+
+        let latestTagSha = safe.child_process.execSync(`git rev-list -n 1 ${latestTag}`, { encoding: 'utf8' });
+        if (safe.error) return exit(`Failed to get head of ${defaultBranch}: ${safe.error.message}`);
+        latestTagSha = latestTagSha.trim();
+
+        if (defaultBranchSha !== latestTagSha) return exit(`Latest tag ${latestTag} does not match HEAD of ${defaultBranch}`);
+    }
+
     const response = await createRequest('POST', `/api/v1/developers/apps/${appstoreId}/versions/${version}/approve`, options);
     if (response.statusCode !== 200) return exit(`Failed to approve version: ${requestError(response)}`);
 
+    if (options.gitPush) {
+        safe.child_process.execSync(`git push --atomic origin ${defaultBranch} ${latestTag}`, { encoding: 'utf8' });
+        if (safe.error) return exit(`Failed to get last release tag: ${safe.error.message}`);
+    }
+
     console.log('Approved.');
     console.log('');
 
@@ -382,68 +408,6 @@ async function approve(localOptions, cmd) {
     console.log('');
 }
 
-async function tag(version) {
-    const basename = `${path.basename(process.cwd())}`;
-    if (!basename.endsWith('-app')) return exit('Does not look like a app repo. Has to end with -app');
-
-    if (!semver.valid(version)) return exit(`${version} is not a valid semver`);
-
-    const latestTag = safe.child_process.execSync('git describe --tags --abbrev=0', { encoding: 'utf8' });
-    if (safe.error) return exit(`Failed to get last release tag: ${safe.error.message}`);
-
-    const manifestFilePath = locateManifest();
-    if (!manifestFilePath) return exit('Could not locate CloudronManifest.json');
-
-    const result = manifestFormat.parseFile(manifestFilePath);
-    if (result.error) return exit(new Error(`Invalid CloudronManifest.json: ${result.error.message}`));
-    const { manifest } = result;
-
-    const latestVersion = latestTag.match(/v(.*)/)[1];
-
-    if (semver.lte(version, latestVersion)) return exit(`${version} is less than or equal to last repo tag ${latestVersion}`);
-    if (semver.inc(latestVersion, 'major') !== version
-        && semver.inc(latestVersion, 'minor') !== version
-        && semver.inc(latestVersion, 'patch') !== version) {
-            return exit(`${version} is not the next major/minor/patch of last published version ${latestVersion}`);
-    }
-
-    const latestRenovateCommit = safe.child_process.execSync('git log -n 1 --committer=renovatebot@cloudron.io --pretty="format:%h,%aI,%s"', { encoding: 'utf8' });
-    if (!latestRenovateCommit) return exit('Could not find a commit from renovate bot');
-
-    const [ , , commitMessage ] = latestRenovateCommit.split(',');
-    const repoDir = path.dirname(manifestFilePath);
-    const upstreamVersion = commitMessage.match(/update dependency .* to (.*)/)[1];
-
-    console.log(`Enter the changelog for ${upstreamVersion}: (press ctrl+D to finish)`);
-    const rawChangelog = fs.readFileSync(0, 'utf-8');
-    const mdChangelog = rawChangelog.split('\n').map(line => {
-        line = line.trim();
-        line = line.replace(/[\u{0080}-\u{FFFF}]/gu, ''); // only ascii
-        line = line.replace(/^\* /, ''); // replace any "* " in the front
-        return line ? `* ${line}` : '';
-    }).join('\n');
-    const newChangelog = `\n[${version}]\n* Update ${manifest.title} to ${upstreamVersion}\n${mdChangelog}\n`;
-    const changelogFile = `${repoDir}/${manifest.changelog.replace('file://', '')}`; // sometimes CHANGELOG, sometimes CHANGELOG.md
-    fs.appendFileSync(changelogFile, newChangelog);
-
-    manifest.version = version;
-    manifest.upstreamVersion = upstreamVersion;
-    fs.writeFileSync('CloudronManifest.json', JSON.stringify(manifest, null, 2));
-
-    // git branch --show-current does not work in CI :/
-    const mainOrMaster = safe.child_process.execSync('git branch -r --list origin/master origin/main', { encoding: 'utf8' });
-    if (safe.error) return exit('Could not determine branch name');
-    const branch = mainOrMaster.includes('master') ? 'master' : 'main';
-
-    execSync(`git commit -a -m 'Version ${version}'`, { encoding: 'utf8' });
-    execSync(`git tag v${version} -a -m 'Version ${version}'`, { encoding: 'utf8' });
-    console.log(`git push --atomic origin ${branch} v${version}`);
-    execSync(`git push --atomic origin HEAD:${branch} v${version}`, { encoding: 'utf8' }); // push this tag only. in CI, we might have a git cache
-    if (safe.error) return exit(`Failed to push tag v${version} and branch ${branch}: ${safe.error.message}`, { encoding: 'utf8' });
-
-    console.log(`Created tag v${version} and pushed branch ${branch}`);
-}
-
 // https://docs.nodebb.org/api/read/
 // https://docs.nodebb.org/api/write/
 async function notify() {