Merge pull request #241 from google/remove-lerna

Remove the dependency on lerna

Author: ChadKillingsworth

.github/workflows/build.yml

@@ -274,7 +274,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'schedule' || github.event_name == 'push' }}
     env:
-      NODE_VERSION: '14.x'
+      NODE_VERSION: '18.x'
       COMPILER_NIGHTLY: ${{ github.event_name == 'schedule' }}
       NPM_TOKEN: ${{ secrets.NPM_PUBLISH_AUTH_TOKEN }}
       FORCE_COLOR: '1'
@@ -340,4 +340,4 @@ jobs:
           git config --global user.name "Github Bot"
           ./build-scripts/create-nightly-version.js
       - name: Publish packages to npm
-        run: ./build-scripts/lerna-publish.js publish-ci --npm-client ${{ github.workspace }}/build-scripts/npm-client.js --ignore-changes '**/*' --force-publish='*' --yes
+        run: yarn publish-packages

.github/workflows/release.yml

@@ -0,0 +1,53 @@
+name: Compiler release
+
+on:
+  workflow_dispatch:
+    inputs:
+      COMPILER_VERSION_NUMBER:
+        description: 'Compiler version to base release from'
+        required: true
+        type: string
+
+jobs:
+  create-release:
+    name: Create release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    env:
+      FORCE_COLOR: '1'
+      NODE_VERSION: '18.x'
+    steps:
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+      - name: Setup Java
+        uses: actions/setup-java@v2
+        with:
+          distribution: adopt-hotspot
+          java-version: 17
+          java-package: jdk
+          architecture: x64
+      - name: Setup Bazel
+        uses: jwlawson/actions-setup-bazel@v1
+        with:
+          bazel-version: '4.2.2'
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Set compiler submodule to release branch
+        working-directory: compiler
+        run: |
+          git fetch --tags https://github.com/google/closure-compiler.git
+          git checkout v${{ github.event.inputs.COMPILER_VERSION_NUMBER }}
+      - name: Install packages
+        run: yarn install --colors=always
+      - name: Build jar
+        run: ./build-scripts/build_compiler.js
+      - name: Create release commit and tag
+        run: |
+          git add compiler
+          yarn version --new-version ${{ github.event.inputs.COMPILER_VERSION_NUMBER }}.0.0
+          git push origin master
+          git push origin v${{ github.event.inputs.COMPILER_VERSION_NUMBER }}

build-scripts/add-os-restrictions.js

@@ -20,22 +20,24 @@
  *
  * Before publication, add OS restrictions to the graal packages.
  * They can't be present before publication as it errors out the installs.
+ * Also set correct architectures. In order to execute `yarn install` in the main package, the current architecture
  */
 
 const fs = require('fs');
 const path = require('path');
 
 // Maps of the os marketing name to the platform name used in package.json os restriction fields
 const osRestrictions = new Map([
-    ['osx', 'darwin'],
-    ['linux', 'linux'],
-    ['windows', 'win32']
+    ['osx', {os: ['darwin'], cpu: ['x32', 'x64', 'arm64']}],
+    ['linux', {os: ['linux'], cpu: ['x32', 'x64']}],
+    ['windows', {os: ['win32'], cpu: ['x32', 'x64']}]
 ]);
 
 // Read the package.json files, add the OS restriction, then write it back.
-osRestrictions.forEach((platformName, osName) => {
-  const packagePath = path.resolve(__dirname, '..', 'packages', `google-closure-compiler-${osName}`, 'package.json');
+osRestrictions.forEach((osAndCpu, packageKey) => {
+  const packagePath = path.resolve(__dirname, '..', 'packages', `google-closure-compiler-${packageKey}`, 'package.json');
   const packageContents = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
-  packageContents.os = [platformName];
+  packageContents.os = osAndCpu.os;
+  packageContents.cpu = osAndCpu.cpu;
   fs.writeFileSync(packagePath, JSON.stringify(packageContents, null, 2) + '\n', 'utf8');
 });

build-scripts/create-nightly-version.js

@@ -21,8 +21,6 @@
  */
 
 const runCommand = require('./run-command');
-const glob = require('glob');
-const path = require('path');
 
 const today = new Date();
 const month = (today.getMonth() < 9 ? '0' : '') + (today.getMonth() + 1).toString();
@@ -33,29 +31,19 @@ const nightlyVersion = `${today.getFullYear()}${month}${day}.0.0-nightly`;
 
 (async () => {
   try {
-    // Lerna won't release packages on an already release tagged commit or
-    // on a disconnected HEAD. Create a branch then commit the os changes for this nightly release.
+    // Create a branch then commit the changes for this nightly release.
     await runCommand('git', ['checkout', '-b', `publish-${nightlyVersion}`]);
     await runCommand('git', ['add', 'compiler']);
-    await runCommand('git', ['add', 'packages/google-closure-compiler-linux/package.json']);
-    await runCommand('git', ['add', 'packages/google-closure-compiler-osx/package.json']);
-    await runCommand('git', ['add', 'packages/google-closure-compiler-windows/package.json']);
-    await runCommand('git', ['commit', '-m', `Create version for nightly release ${nightlyVersion}`]);
-    // Get the list of packages in this repo
-    const packages = glob.sync('packages/google-closure-compiler*')
-        .map(packagePath => packagePath.replace('packages/', ''));
-
-    // Create a nightly version of all the packages
     await runCommand(
-      'node',
-      [
-        './build-scripts/lerna-publish.js',
-        'version',
-        nightlyVersion,
-        '--push=false', // prevent the version commit from being pushed back to the repo
-        `--force-publish=${packages.join(',')}`, // publish every package even though no changes are detected
-        '--yes', // don't prompt for confirmation
-      ]);
+        'yarn',
+        [
+            'version',
+            '--new-version',
+            nightlyVersion,
+            '--message',
+            `Create version for nightly release ${nightlyVersion}`
+        ]
+    );
   } catch (e) {
     console.error(e);
     process.exitCode = 1;