Nightly proccess preparations: Setting Enso version through the environment

.github/workflows/nightly.yml

@@ -169,13 +169,6 @@ jobs:
           sleep 1
           sbt --no-colors bootstrap
 
-      - name: Update the Stdlib Version
-        working-directory: repo
-        shell: bash
-        run: |
-          sleep 1
-          sbt --no-colors "stdlib-version-updater/run update --no-format"
-
       # Verify Legal Review
       - name: Verify Packages
         if: runner.os != 'Windows' # TODO [RW] CRLF handling in licenses task

.github/workflows/release.yml

@@ -133,13 +133,6 @@ jobs:
           sleep 1
           sbt --no-colors verifyLicensePackages
 
-      - name: Verify the Stdlib Version
-        working-directory: repo
-        shell: bash
-        run: |
-          sleep 1
-          sbt --no-colors "stdlib-version-updater/run check"
-
       # Prepare distributions
       - name: Build the Launcher Native Image
         working-directory: repo

.github/workflows/scala-new.yml

@@ -1,6 +1,6 @@
 # This is the new, in progress, Build Workflow for the Enso Engine.
 
-name: Engine CI V2
+name: Engine CI (new)
 
 on:
   push:
@@ -16,7 +16,7 @@ jobs:
       - ${{ matrix.os }}
       - self-hosted
       - engine
-    timeout-minutes: 180
+    timeout-minutes: 90
     strategy:
       matrix:
         # The macOS support is not yet done. For now, the GitHub-hosted runner
@@ -43,7 +43,8 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: ${{ env.ENGINE_DIST_NAME }}
-          path: ${{ env.ENGINE_DIST_ROOT }}/${{ env.ENGINE_DIST_NAME }}.zip
+          # Irregular, engine is pre-zipped to avoid long paths issues of nodejs.
+          path: ${{ env.ENGINE_DIST_ARCHIVE }}
       - name: Publish the Launcher
         uses: actions/upload-artifact@v2
         with:

.github/workflows/scala.yml

@@ -1,4 +1,4 @@
-name: Engine CI
+name: Engine CI (legacy)
 
 on:
   push:
@@ -123,11 +123,6 @@ jobs:
           sleep 1
           sbt --no-colors bootstrap
 
-      - name: Verify the Stdlib Version
-        run: |
-          sleep 1
-          sbt --no-colors "stdlib-version-updater/run check"
-
       # Compile
       - name: Build Enso
         run: |

build.sbt

@@ -15,12 +15,22 @@ import java.io.File
 // === Global Configuration ===================================================
 // ============================================================================
 
-val scalacVersion  = "2.13.7"
-val graalVersion   = "21.1.0"
-val javaVersion    = "11"
-val ensoVersion    = "0.2.32-SNAPSHOT"  // Note [Engine And Launcher Version]
-val currentEdition = "2021.20-SNAPSHOT" // Note [Default Editions]
-val stdLibVersion  = ensoVersion
+val scalacVersion         = "2.13.7"
+val graalVersion          = "21.1.0"
+val javaVersion           = "11"
+val defaultDevEnsoVersion = "0.0.0-dev"
+val ensoVersion = sys.env.getOrElse(
+  "ENSO_VERSION",
+  defaultDevEnsoVersion
+) // Note [Engine And Launcher Version]
+val currentEdition = sys.env.getOrElse(
+  "ENSO_EDITION",
+  defaultDevEnsoVersion
+) // Note [Default Editions]
+
+// Note [Stdlib Version]
+val stdLibVersion       = defaultDevEnsoVersion
+val targetStdlibVersion = ensoVersion
 
 /* Note [Engine And Launcher Version]
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -44,6 +54,16 @@ val stdLibVersion  = ensoVersion
  * release.
  */
 
+/* Note [Stdlib Version]
+ * ~~~~~~~~~~~~~~~~~~~~~
+ * The `stdlibVersion` variable stores the version at which standard library is
+ * stored within the source tree, which is currently set to a constant of
+ * `0.0.0-dev`.
+ *
+ * When distributions are built, the library versions are updated to match the
+ * current Enso version.
+ */
+
 ThisBuild / organization := "org.enso"
 ThisBuild / scalaVersion := scalacVersion
 
@@ -247,7 +267,6 @@ lazy val enso = (project in file("."))
     `library-manager`,
     `library-manager-test`,
     `connected-lock-manager`,
-    `stdlib-version-updater`,
     syntax.jvm,
     testkit
   )
@@ -748,8 +767,7 @@ lazy val `version-output` = (project in file("lib/scala/version-output"))
           ensoVersion    = ensoVersion,
           scalacVersion  = scalacVersion,
           graalVersion   = graalVersion,
-          currentEdition = currentEdition,
-          stdLibVersion  = stdLibVersion
+          currentEdition = currentEdition
         )
     }.taskValue
   )
@@ -1378,6 +1396,7 @@ lazy val editions = project
       .dependsOn(
         Def.task {
           Editions.writeEditionConfig(
+            editionsRoot   = file("distribution") / "editions",
             ensoVersion    = ensoVersion,
             editionName    = currentEdition,
             libraryVersion = stdLibVersion,
@@ -1470,13 +1489,6 @@ lazy val `connected-lock-manager` = project
   .dependsOn(`polyglot-api`)
   .dependsOn(testkit % Test)
 
-lazy val `stdlib-version-updater` = project
-  .in(file("lib/scala/stdlib-version-updater"))
-  .configs(Test)
-  .dependsOn(`version-output`)
-  .dependsOn(pkg)
-  .dependsOn(cli)
-
 lazy val `runtime-version-manager` = project
   .in(file("lib/scala/runtime-version-manager"))
   .configs(Test)
@@ -1710,11 +1722,15 @@ buildEngineDistribution := {
   val log          = streams.value.log
   val cacheFactory = streams.value.cacheStoreFactory
   DistributionPackage.createEnginePackage(
-    distributionRoot = root,
-    cacheFactory     = cacheFactory,
-    graalVersion     = graalVersion,
-    javaVersion      = javaVersion,
-    stdlibVersion    = stdLibVersion
+    distributionRoot    = root,
+    cacheFactory        = cacheFactory,
+    log                 = log,
+    graalVersion        = graalVersion,
+    javaVersion         = javaVersion,
+    ensoVersion         = ensoVersion,
+    editionName         = currentEdition,
+    sourceStdlibVersion = stdLibVersion,
+    targetStdlibVersion = targetStdlibVersion
   )
   log.info(s"Engine package created at $root")
 }

build/release.js

@@ -14,7 +14,7 @@ const yaml = require('js-yaml')
 const config = yaml.load(fss.readFileSync(path.join(paths.gui.root, 'config.yaml'), 'utf-8'))
 
 const CHANGELOG_FILE_NAME = 'CHANGELOG.md'
-const CHANGELOG_FILE = path.join(paths.gui.root, CHANGELOG_FILE_NAME)
+const CHANGELOG_FILE = path.join(paths.root, CHANGELOG_FILE_NAME)
 const ENGINE_VERSION = config.engineVersionSupported
 
 // ===============

distribution/lib/Standard/Base/0.2.32-SNAPSHOT/package.yaml → distribution/lib/Standard/Base/0.0.0-dev/package.yaml

@@ -1,6 +1,6 @@
 name: Base
 namespace: Standard
-version: 0.2.32-SNAPSHOT
+version: 0.0.0-dev
 license: APLv2
 authors:
   - name: Enso Team

distribution/lib/Standard/Database/0.2.32-SNAPSHOT/package.yaml → distribution/lib/Standard/Database/0.0.0-dev/package.yaml

@@ -1,6 +1,6 @@
 name: Database
 namespace: Standard
-version: 0.2.32-SNAPSHOT
+version: 0.0.0-dev
 license: APLv2
 authors:
   - name: Enso Team

distribution/lib/Standard/Examples/0.2.32-SNAPSHOT/package.yaml → distribution/lib/Standard/Examples/0.0.0-dev/package.yaml

@@ -1,6 +1,6 @@
 name: Examples
 namespace: Standard
-version: 0.2.32-SNAPSHOT
+version: 0.0.0-dev
 license: APLv2
 authors:
   - name: Enso Team

distribution/lib/Standard/Geo/0.2.32-SNAPSHOT/package.yaml → distribution/lib/Standard/Geo/0.0.0-dev/package.yaml

@@ -1,6 +1,6 @@
 name: Geo
 namespace: Standard
-version: 0.2.32-SNAPSHOT
+version: 0.0.0-dev
 license: APLv2
 authors:
   - name: Enso Team

distribution/lib/Standard/Google_Api/0.2.32-SNAPSHOT/package.yaml → distribution/lib/Standard/Google_Api/0.0.0-dev/package.yaml

@@ -1,6 +1,6 @@
 name: Google_Api
 namespace: Standard
-version: 0.2.32-SNAPSHOT
+version: 0.0.0-dev
 license: APLv2
 authors:
   - name: Enso Team

distribution/lib/Standard/Image/0.2.32-SNAPSHOT/package.yaml → distribution/lib/Standard/Image/0.0.0-dev/package.yaml

@@ -1,6 +1,6 @@
 name: Image
 namespace: Standard
-version: 0.2.32-SNAPSHOT
+version: 0.0.0-dev
 license: APLv2
 authors:
   - name: Enso Team

distribution/lib/Standard/Searcher/0.2.32-SNAPSHOT/package.yaml → distribution/lib/Standard/Searcher/0.0.0-dev/package.yaml

@@ -1,6 +1,6 @@
 name: Base
 namespace: Standard
-version: 0.2.32-SNAPSHOT
+version: 0.0.0-dev
 license: APLv2
 authors:
   - name: Enso Team

distribution/lib/Standard/Table/0.2.32-SNAPSHOT/package.yaml → distribution/lib/Standard/Table/0.0.0-dev/package.yaml

@@ -1,6 +1,6 @@
 name: Table
 namespace: Standard
-version: 0.2.32-SNAPSHOT
+version: 0.0.0-dev
 license: APLv2
 authors:
   - name: Enso Team

distribution/lib/Standard/Test/0.2.32-SNAPSHOT/package.yaml → distribution/lib/Standard/Test/0.0.0-dev/package.yaml

@@ -1,6 +1,6 @@
 name: Test
 namespace: Standard
-version: 0.2.32-SNAPSHOT
+version: 0.0.0-dev
 license: APLv2
 authors:
   - name: Enso Team

distribution/lib/Standard/Visualization/0.2.32-SNAPSHOT/package.yaml → distribution/lib/Standard/Visualization/0.0.0-dev/package.yaml

@@ -1,6 +1,6 @@
 name: Visualization
 namespace: Standard
-version: 0.2.32-SNAPSHOT
+version: 0.0.0-dev
 license: APLv2
 authors:
   - name: Enso Team