cloudron 5.11.2 → 5.11.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "5.11.2",
+  "version": "5.11.3",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",

package/src/repo-actions.js

@@ -66,15 +66,15 @@ async function tag(version, options) {
     manifest.upstreamVersion = upstreamVersion;
     fs.writeFileSync('CloudronManifest.json', JSON.stringify(manifest, null, 2));
 
-    // set GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL if needed
-    const rawBranch = safe.child_process.execSync('git branch --show-current', { encoding: 'utf8' }); // master or main
+    // 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 = rawBranch.trim();
+    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 ${branch} v${version}`, { encoding: 'utf8' }); // push this tag only. in CI, we might have a git cache
+    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}`);