revert: "ci: publish prerelease versions (#2548)"

.deployment.config.json

@@ -190,8 +190,7 @@
     "no_endpoint": true
   },
   "package_rollout": {
-    "only_consider_changesets_after": "b244fe702d8e96d016a52715e92c8131acfde3ba",
-    "disabled": $[STOP_AT_DEV]
+    "only_consider_changesets_after": "b244fe702d8e96d016a52715e92c8131acfde3ba"
   },
   "deployment_config_version": 7
 }

.github/workflows/masterbot.yml

@@ -3,7 +3,6 @@ on:
   push:
     branches:
       - master
-      - 'prerelease/**'
 jobs:
   build:
     name: 'Build'

Jenkinsfile

@@ -1,17 +1,10 @@
-def parseSemanticVersion(String version) {
-  def semanticVersionRegex = /^(((([0-9]+)\.[0-9]+)\.[0-9]+)(?:\-.+)?)$/
-  def (_, prerelease, patch, minor, major) = (version =~ semanticVersionRegex)[0]
-  return [major, minor, patch, prerelease]
-}
-
 node('heavy && linux && docker') {
   checkout scm
   def tag = sh(script: "git tag --contains", returnStdout: true).trim()
   def isBump = !!tag
-  def isOnReleaseBranch = env.BRANCH_NAME == 'master'
-  def isOnPrereleaseBranch = env.BRANCH_NAME.startsWith('prerelease/')
+  def isMaster = env.BRANCH_NAME == 'master'
 
-  if (!isOnReleaseBranch && !isOnPrereleaseBranch) {
+  if (!isMaster) {
     return
   }
 
@@ -39,14 +32,12 @@ node('heavy && linux && docker') {
       sh 'git clean -f'
     }
 
-    if (isOnReleaseBranch) {
-      withDockerContainer(image: 'node:16', args: '-u=root -e HOME=/tmp -e NPM_CONFIG_PREFIX=/tmp/.npm') {
-        stage('Npm publish') {
-          withCredentials([
-          string(credentialsId: 'NPM_TOKEN', variable: 'NPM_TOKEN')]) {
-            sh "echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} > ~/.npmrc"
-            sh 'npm run npm:publish:alpha || true'
-          }
+    withDockerContainer(image: 'node:16', args: '-u=root -e HOME=/tmp -e NPM_CONFIG_PREFIX=/tmp/.npm') {
+      stage('Npm publish') {
+        withCredentials([
+        string(credentialsId: 'NPM_TOKEN', variable: 'NPM_TOKEN')]) {
+          sh "echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} > ~/.npmrc"
+          sh 'npm run npm:publish:alpha || true'
         }
       }
     }
@@ -57,22 +48,23 @@ node('heavy && linux && docker') {
         headless = readJSON file: 'packages/headless/package.json'
         atomic = readJSON file: 'packages/atomic/package.json'
         atomicReact = readJSON file: 'packages/atomic-react/package.json'
+        semanticVersionRegex = /^([^\.]*)\.[^\.]*/
+
+        (headlessMinor, headlessMajor) = (headless.version =~ semanticVersionRegex)[0]
+        (atomicMinor, atomicMajor) = (atomic.version =~ semanticVersionRegex)[0]
+        (atomicReactMinor, atomicReactMajor) = (atomicReact.version =~ semanticVersionRegex)[0]
 
-        (headlessMajor, headlessMinor, headlessPatch) = parseSemanticVersion(headless.version)
-        (atomicMajor, atomicMinor, atomicPatch) = parseSemanticVersion(atomic.version)
-        (atomicReactMajor, atomicReactMinor, atomicReactPatch) = parseSemanticVersion(atomicReact)
 
         sh "deployment-package package create --with-deploy \
         --resolve HEADLESS_MAJOR_VERSION=${headlessMajor} \
         --resolve HEADLESS_MINOR_VERSION=${headlessMinor} \
-        --resolve HEADLESS_PATCH_VERSION=${headlessPatch} \
+        --resolve HEADLESS_PATCH_VERSION=${headless.version} \
         --resolve ATOMIC_MAJOR_VERSION=${atomicMajor} \
         --resolve ATOMIC_MINOR_VERSION=${atomicMinor} \
-        --resolve ATOMIC_PATCH_VERSION=${atomicPatch} \
+        --resolve ATOMIC_PATCH_VERSION=${atomic.version} \
         --resolve ATOMIC_REACT_MAJOR_VERSION=${atomicReactMajor} \
         --resolve ATOMIC_REACT_MINOR_VERSION=${atomicReactMinor} \
-        --resolve ATOMIC_REACT_PATCH_VERSION=${atomicReactPatch} \
-        --resolve STOP_AT_DEV=${!isOnReleaseBranch} \
+        --resolve ATOMIC_REACT_PATCH_VERSION=${atomicReact.version} \
         || true"
       }
     }

scripts/deploy/bump-version.mjs

@@ -36,9 +36,13 @@ async function bumpVersionAndPush() {
 
 async function main() {
   try {
-    if ((await getHowManyCommitsBehind()) !== 0) {
+    const buildCommitHash = await getHeadCommitHash();
+    await checkoutLatestMaster();
+    const masterCommitHash = await getHeadCommitHash();
+
+    if (buildCommitHash !== masterCommitHash) {
       console.log(
-        'Build commit does not match latest commit. Skipping version bump.'
+        'Build commit does not match latest master commit. Skipping version bump.'
       );
       return;
     }

scripts/deploy/invalidate-cloudfront.mjs

@@ -1,19 +1,21 @@
 import {CloudFront} from 'aws-sdk';
 import {resolve} from 'path';
-import {getPackageFromPath, workspacesRoot} from '../packages.mjs';
+import {getPackageFromPath} from '../packages.mjs';
 
 const cloudfront = new CloudFront();
 
 async function getMajorVersion(dir) {
   const {version} = getPackageFromPath(
-    resolve(workspacesRoot, 'packages', dir, 'package.json')
+    resolve('..', '..', 'packages', dir, 'package.json')
   );
   return version.split('.')[0];
 }
 
 async function main() {
   const pathsToInvalidate = [
+    '/atomic/latest/*',
     `/atomic/v${await getMajorVersion('atomic')}/*`,
+    '/headless/latest/*',
     `/headless/v${await getMajorVersion('headless')}/*`,
   ];
 

scripts/deploy/update-npm-tag.mjs

@@ -1,17 +1,12 @@
-import {resolve} from 'path';
 import {execute} from '../exec.mjs';
-import {
-  packageDirsNpmTag,
-  getPackageFromPath,
-  workspacesRoot,
-} from '../packages.mjs';
+import {packageDirsNpmTag, getPackageFromPath} from '../packages.mjs';
+import {resolve} from 'path';
+import {promisify} from 'util';
 
 async function main() {
   const requests = packageDirsNpmTag
     .map((dir) =>
-      getPackageFromPath(
-        resolve(workspacesRoot, 'packages', dir, 'package.json')
-      )
+      getPackageFromPath(resolve('..', '..', 'packages', dir, 'package.json'))
     )
     .map(({name, version}) => updateNpmTag(name, version));
 

scripts/notify-docs/published-ui-kit.mjs

@@ -1,15 +1,15 @@
 import {Octokit} from '@octokit/rest';
 import {resolve} from 'path';
-import {getPackageFromPath, workspacesRoot} from '../packages.mjs';
+import {getPackageFromPath} from '../packages.mjs';
 
 const headlessPackageJson = getPackageFromPath(
-  resolve(workspacesRoot, 'packages', 'headless', 'package.json')
+  resolve('..', '..', 'packages', 'headless', 'package.json')
 );
 const atomicPackageJson = getPackageFromPath(
-  resolve(workspacesRoot, 'packages', 'atomic', 'package.json')
+  resolve('..', '..', 'packages', 'atomic', 'package.json')
 );
 const quanticPackageJson = getPackageFromPath(
-  resolve(workspacesRoot, 'packages', 'quantic', 'package.json')
+  resolve('..', '..', 'packages', 'quantic', 'package.json')
 );
 
 const token = process.env.GITHUB_TOKEN || '';