Bump the development version number (#1389)

.github/settings.yml

@@ -222,7 +222,7 @@ branches:
           - "license/cla"
       enforce_admins: null
       restrictions: null
-  - name: "release/*"
+  - name: "release/*.x"
     protection:
       required_pull_request_reviews:
         required_approving_review_count: 1

build.sbt

@@ -15,7 +15,7 @@ val scalacVersion = "2.13.3"
 val rustVersion   = "1.40.0-nightly (b520af6fd 2019-11-03)"
 val graalVersion  = "20.2.0"
 val javaVersion   = "11"
-val ensoVersion   = "0.2.0-SNAPSHOT" // Note [Engine And Launcher Version]
+val ensoVersion   = "0.2.1-SNAPSHOT" // Note [Engine And Launcher Version]
 
 /* Note [Engine And Launcher Version]
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

distribution/launcher-manifest.yaml

@@ -1,6 +1,5 @@
 minimum-version-for-upgrade: 0.1.0
 files-to-copy:
-  - NOTICE
   - README.md
 directories-to-copy:
   - THIRD-PARTY

distribution/manifest.template.yaml

@@ -1,5 +1,5 @@
-minimum-launcher-version: 0.0.1
-minimum-project-manager-version: 0.0.1
+minimum-launcher-version: 0.2.0
+minimum-project-manager-version: 0.2.0
 jvm-options:
   - value: "-Dpolyglot.engine.IterativePartialEscape=true"
   - value: "-Dtruffle.class.path.append=$enginePackagePath\\component\\runtime.jar"

docs/distribution/release-policy.md

@@ -81,17 +81,20 @@ Cutting a release for Enso proceeds as follows:
     created.
 2.  Release notes should be made up to date in `RELEASES.md` and committed to
     the release branch.
-3.  A commit representing the release should be tagged on the release branch,
-    and the tag pushed to GitHub.
-4.  CI will create a draft release for this tag, as well as build and upload the
-    appropriate artefacts.
-5.  The release notes for the version being released should be copied into the
+3.  Ensure that the project version is set to the version that you want to
+    release.
+4.  A commit representing the release should be tagged on the release branch,
+    and the tag pushed to GitHub. The tag should have a description that
+    consists of the release notes for that tag, replacing hashes with `=`.
+5.  CI will create a draft release for this tag, as well as build and upload the
+    appropriate artefacts. **Do not** create a release for your tag manually.
+6.  The release notes for the version being released should be copied into the
     release body on GitHub.
-6.  The release must be verified by two members of the engine team, and the QA
+7.  The release must be verified by two members of the engine team, and the QA
     team.
-7.  Once approval has been gained from these members, the release may be made
+8.  Once approval has been gained from these members, the release may be made
     official.
-8.  Push a commit to `main` bumping the version number and ensuring that it
+9.  Push a commit to `main` bumping the version number and ensuring that it
     remains a `SNAPSHOT` version.
 
 ### Tag Naming
@@ -306,8 +309,7 @@ and are contained in the `RELEASES.md` file in the repository root.
   significant improvements to the internals of Enso and related tools.
 ```
 
-If there are no changes for a section, the section should contain a bullet point
-that reads "Nothing".
+If there are no changes for a section, the section may be removed.
 
 The releases file is an ongoing record of changes, and may diverge between
 `main` and the various release branches.

docs/getting-enso.md

@@ -8,22 +8,37 @@ order: 5
 
 # Getting Enso
 
-Enso packages can currently be obtained from the per-commit CI builds. See
-[the build workflow on GitHub Actions](https://github.com/enso-org/enso/actions?query=workflow%3A%22Engine+CI%22+branch%3Amain),
-which should show a list of recent CI builds. The workflow of interest is
-`Engine CI`. You can navigate to the most recent build, which will display a
-list of attached artifacts. The artifact of interest is `enso-engine-<version>`
-(currently `enso-engine-0.2.0-SNAPSHOT`).
+Enso packages are best obtained from the
+[releases](https://github.com/enso-org/enso/releases) page of the repository.
+Each release has an "Assets" section at the bottom. You can click on this to
+view the list of artifacts from which you can download the most appropriate
+version.
+
+These assets contain bundles that include the Enso launcher, an engine version,
+and GraalVM, allowing you to get up and running immediately. Alternatively, you
+can download just the launcher, which will handle downloading and installing the
+required components for you.
 
 <!-- MarkdownTOC levels="2,3" autolink="true" -->
 
+- [Nightly Builds](#nightly-builds)
   - [Dependencies](#dependencies)
   - [Running Enso](#running-enso)
   - [Troubleshooting](#troubleshooting)
 
 <!-- /MarkdownTOC -->
 
-## Dependencies
+## Nightly Builds
+
+In addition to the official releases, we provide nightly snapshots built on our
+CI. These can be obtained from
+[the build workflow on GitHub Actions](https://github.com/enso-org/enso/actions?query=workflow%3A%22Engine+CI%22+branch%3Amain),
+which should show a list of recent CI builds. The workflow of interest is
+`Engine CI`. You can navigate to the most recent build, which will display a
+list of attached artifacts. The artifact of interest is `enso-engine-<version>`
+(currently `enso-engine-0.2.1-SNAPSHOT`).
+
+### Dependencies
 
 The Enso distribution requires to be run with the appropriate version of
 GraalVM. You can get the Community Edition pre-built distributions from
@@ -36,15 +51,15 @@ is `20.2.0`, and it must be the Java 11 build.
 Before running the Enso packages, make sure that the `JAVA_HOME` environment
 variable points to the correct home location of the Graal distribution.
 
-## Running Enso
+### Running Enso
 
-The distribution contains the Enso CLI. It allows to create and run Enso
+The nightly distribution contains the Enso CLI. It allows to create and run Enso
 projects from the command line. To launch the Enso CLI, run the `bin/enso`
 script (Linux and MacOS) or the `bin/enso.bat` script (Windows).
 
 Again, it is necessary for you to set the `JAVA_HOME` variable correctly.
 
-## Troubleshooting
+### Troubleshooting
 
 This section lists the most common failures and their probable causes.