enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-11-22 11:52:59 +03:00
Code Issues Projects Releases Wiki Activity

Fix the release workflow (#1057)

Browse Source
This commit is contained in:
Josef 2020-08-07 11:18:09 +02:00 committed by GitHub
parent 0e5a20d8ad
commit 1f8a4b802f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 393 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/settings.yml vendored
View File

@ -214,7 +214,9 @@ branches:
- "Test Engine (macOS-latest)"
- "Test Engine (ubuntu-latest)"
- "Test Engine (windows-latest)"
- "Build Engine"
- "Build Engine (macOS-latest)"
- "Build Engine (ubuntu-latest)"
- "Build Engine (windows-latest)"
- "Rust Check"
- "Rust Lint"
- "Rust Test Native (macOS-latest)"

315
.github/workflows/release.yml vendored
View File

@ -12,116 +12,15 @@ env:
javaVersion: 11
# Please ensure that this is in sync with project/build.properties
sbtVersion: 1.3.13
# Please ensure that this is in sync with rustVersion in build.sbt
rustToolchain: nightly-2019-11-04
jobs:
# This job should be kept up-to-date with scala.yml#build (but keep the added version check)
build-engine:
name: Build Engine
runs-on: ubuntu-latest
needs: build-launcher
timeout-minutes: 30
strategy:
fail-fast: true
steps:
- name: Checkout
uses: actions/checkout@v2
with:
path: repo
- name: Setup conda
uses: s-weigand/setup-conda@v1
with:
update-conda: true
conda-channels: anaconda, conda-forge
- name: Install FlatBuffers Compiler
run: conda install flatbuffers=1.12.0
- name: Setup GraalVM Environment
uses: ayltai/setup-graalvm@v1
with:
graalvm-version: ${{ env.graalVersion }}
java-version: ${{ env.javaVersion }}
native-image: false
- name: Set Up SBT
run: |
curl -fsSL -o sbt.tgz https://piccolo.link/sbt-${{env.sbtVersion}}.tgz
tar -xzf sbt.tgz
echo ::add-path::$GITHUB_WORKSPACE/sbt/bin/
# Caches
- name: Cache SBT
uses: actions/cache@v2
with:
path: |
~/.sbt
~/.ivy2/cache
~/.cache
key: ${{ runner.os }}-sbt-${{ hashFiles('**build.sbt') }}
restore-keys: ${{ runner.os }}-sbt-
# Build Artifacts
- name: Bootstrap the project
working-directory: repo
run: sbt --no-colors bootstrap
- name: Build the Runtime Uberjar
working-directory: repo
run: sbt --no-colors runtime/assembly
- name: Build the Runner Uberjar
working-directory: repo
run: sbt --no-colors runner/assembly
- name: Build the Project Manager Uberjar
working-directory: repo
run: sbt --no-colors project-manager/assembly
- name: Build the Manifest
working-directory: repo
run: |
cp distribution/manifest.template.yaml manifest.yaml
echo "graal-vm-version: ${{ env.graalVersion }}" >> manifest.yaml
echo "graal-java-version: ${{ env.javaVersion }}" >> manifest.yaml
- name: Prepare Engine Distribution
working-directory: repo
run: |
DIST_VERSION=$(./runner.jar --version --json | jq -r '.version')
DIST_ROOT=enso-engine-$DIST_VERSION
DIST_DIR=$DIST_ROOT/enso-$DIST_VERSION
mkdir -p $DIST_DIR
mkdir $DIST_DIR/component
cp runtime.jar $DIST_DIR/component
mv runner.jar $DIST_DIR/component
mv project-manager.jar $DIST_DIR/component
cp -r distribution/std-lib $DIST_DIR/std-lib
cp -r distribution/bin $DIST_DIR/bin
chmod +x $DIST_DIR/bin/enso
chmod +x $DIST_DIR/bin/project-manager
echo ::set-env name=DIST_VERSION::$DIST_VERSION
echo ::set-env name=DIST_ROOT::$DIST_ROOT
echo ::set-env name=DIST_DIR::$DIST_DIR
# Ensure that the versions encoded in the binary and in the release match
- name: Check Versions
shell: bash
run: |
ref=${{ github.ref }}
refversion=${ref#"refs/tags/enso-"}
binversion=${{ env.DIST_VERSION }}
test $binversion = $refversion || (echo "Tag version $refversion and the binary version $binversion do not match" && false)
# Publish
- name: Upload the Engine Artifact
uses: actions/upload-artifact@v2
with:
name: ${{ env.DIST_ROOT }}
path: repo/${{ env.DIST_ROOT }}
- name: Upload the Manifest Artifact
uses: actions/upload-artifact@v2
with:
name: manifest
path: repo/manifest.yaml
# This job should be kept up-to-date with scala.yml#build-launcher (but keep the added version check)
build-launcher:
name: Build Launcher
build:
name: Build
runs-on: ${{ matrix.os }}
timeout-minutes: 30
timeout-minutes: 45
strategy:
matrix:
os: [macOS-latest, ubuntu-latest, windows-latest]
@ -131,8 +30,28 @@ jobs:
uses: actions/checkout@v2
with:
path: repo
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ env.rustToolchain }}
override: true
- name: Enable Developer Command Prompt (Windows)
uses: ilammy/msvc-dev-cmd@v1.3.0
- name: Setup conda
uses: s-weigand/setup-conda@v1
with:
update-conda: true
conda-channels: anaconda, conda-forge
- name: Setup Conda Environment on Windows
if: runner.os == 'Windows'
run: |
conda create --name enso
conda init powershell
- name: Activate Conda Environment on Windows
if: runner.os == 'Windows'
run: conda activate enso
- name: Install FlatBuffers Compiler
run: conda install flatbuffers=1.12.0
- name: Setup GraalVM Environment
uses: ayltai/setup-graalvm@v1
with:
@ -157,81 +76,155 @@ jobs:
restore-keys: ${{ runner.os }}-sbt-
# Build Artifacts
- name: Build Launcher Native Image
- name: Bootstrap the Project
working-directory: repo
run: sbt --no-colors bootstrap
- name: Build the Runtime Uberjar
working-directory: repo
run: sbt --no-colors runtime/assembly
- name: Build the Runner Uberjar
working-directory: repo
run: sbt --no-colors runner/assembly
- name: Build the Project Manager Uberjar
working-directory: repo
run: sbt --no-colors project-manager/assembly
- name: Build the Launcher Native Image
working-directory: repo
run: sbt --no-colors launcher/buildNativeImage
- name: Build the Manifest
working-directory: repo
run: |
cp distribution/manifest.template.yaml manifest.yaml
echo "graal-vm-version: ${{ env.graalVersion }}" >> manifest.yaml
echo "graal-java-version: ${{ env.javaVersion }}" >> manifest.yaml
# Publish
- name: Prepare distribution directory name (Unix)
# Prepare distributions
- name: Prepare Distribution Version (Unix)
working-directory: repo
if: runner.os != 'Windows'
shell: bash
run: |
chmod +x enso
DIST_VERSION=$(./enso version --json | jq -r '.version')
DIST_ROOT=enso-launcher-$DIST_VERSION-$(echo ${{ runner.os }} | awk '{print tolower($0)}')-amd64
DIST_DIR=$DIST_ROOT/enso
echo ::set-env name=DIST_VERSION::$DIST_VERSION
echo ::set-env name=DIST_DIR::$DIST_DIR
echo ::set-env name=DIST_ROOT::$DIST_ROOT
- name: Prepare distribution directory name (Windows)
- name: Prepare Distribution Version (Windows)
working-directory: repo
if: runner.os == 'Windows'
shell: bash
run: |
DIST_VERSION=$(./enso.exe version --json | jq -r '.version')
DIST_ROOT=enso-launcher-$DIST_VERSION-$(echo ${{ runner.os }} | awk '{print tolower($0)}')-amd64
DIST_DIR=$DIST_ROOT/enso
echo ::set-env name=DIST_VERSION::$DIST_VERSION
echo ::set-env name=DIST_DIR::$DIST_DIR
echo ::set-env name=DIST_ROOT::$DIST_ROOT
- name: Prepare Launcher distribution (common)
# Currently the only architecture supported by Github runners is amd64
- name: Prepare Distribution Environment
working-directory: repo
shell: bash
run: |
mkdir -p ${{ env.DIST_DIR }}
mkdir ${{ env.DIST_DIR }}/bin
mkdir ${{ env.DIST_DIR }}/config
mkdir ${{ env.DIST_DIR }}/dist
mkdir ${{ env.DIST_DIR }}/runtime
cp distribution/launcher/.enso.portable ${{ env.DIST_DIR }}
cp distribution/launcher/README.md ${{ env.DIST_DIR }}
cp distribution/launcher/NOTICE ${{ env.DIST_DIR }}
cp -r distribution/launcher/components-licences ${{ env.DIST_DIR }}
DIST_ARCH=amd64
DIST_OS=$(echo ${{ runner.os }} | awk '{print tolower($0)}')
LAUNCHER_DIST_ROOT=enso-launcher-$DIST_VERSION-$DIST_OS-$DIST_ARCH
LAUNCHER_DIST_DIR=$LAUNCHER_DIST_ROOT/enso
ENGINE_DIST_ROOT=enso-engine-$DIST_VERSION-$DIST_OS-$DIST_ARCH
ENGINE_DIST_DIR=$ENGINE_DIST_ROOT/enso-$DIST_VERSION
echo ::set-env name=LAUNCHER_DIST_DIR::$LAUNCHER_DIST_DIR
echo ::set-env name=LAUNCHER_DIST_ROOT::$LAUNCHER_DIST_ROOT
echo ::set-env name=ENGINE_DIST_DIR::$ENGINE_DIST_DIR
echo ::set-env name=ENGINE_DIST_ROOT::$ENGINE_DIST_ROOT
- name: Prepare Launcher distribution (Unix)
- name: Prepare Launcher Distribution (Common)
working-directory: repo
shell: bash
run: |
mkdir -p ${{ env.LAUNCHER_DIST_DIR }}
mkdir ${{ env.LAUNCHER_DIST_DIR }}/bin
mkdir ${{ env.LAUNCHER_DIST_DIR }}/dist
mkdir ${{ env.LAUNCHER_DIST_DIR }}/runtime
cp distribution/launcher/.enso.portable ${{ env.LAUNCHER_DIST_DIR }}
cp distribution/launcher/README.md ${{ env.LAUNCHER_DIST_DIR }}
cp distribution/launcher/NOTICE ${{ env.LAUNCHER_DIST_DIR }}
cp -r distribution/launcher/components-licences ${{ env.LAUNCHER_DIST_DIR }}
- name: Prepare Launcher Distribution (Unix)
working-directory: repo
if: runner.os != 'Windows'
shell: bash
run: |
cp enso ${{ env.DIST_DIR }}/bin/
cp enso ${{ env.LAUNCHER_DIST_DIR }}/bin/
- name: Prepare Launcher distribution (Windows)
- name: Prepare Launcher Distribution (Windows)
working-directory: repo
if: runner.os == 'Windows'
shell: bash
run: |
cp enso.exe ${{ env.DIST_DIR }}/bin/
cp enso.exe ${{ env.LAUNCHER_DIST_DIR }}/bin/
# The way artifacts are uploaded currently does not preserve the
# executable bits for Unix. However putting artifacts into a ZIP would
# create a twice nested ZIP file. For now, users downloading artifacts
# from the CI builds have to set the bit themselves.
# So the following two lines have been removed from this step, as they do
# nothing useful:
# chmod +x $ENGINE_DIST_DIR/bin/enso
# chmod +x $ENGINE_DIST_DIR/bin/project-manager
- name: Prepare Engine Distribution
working-directory: repo
shell: bash
run: |
mkdir -p $ENGINE_DIST_DIR
mkdir $ENGINE_DIST_DIR/component
cp runtime.jar $ENGINE_DIST_DIR/component
mv runner.jar $ENGINE_DIST_DIR/component
mv project-manager.jar $ENGINE_DIST_DIR/component
cp -r distribution/std-lib $ENGINE_DIST_DIR/std-lib
cp -r distribution/bin $ENGINE_DIST_DIR/bin
cp manifest.yaml $ENGINE_DIST_DIR
# Ensure that the versions encoded in the binary and in the release match
- name: Check Versions
- name: Check Versions (Unix)
working-directory: repo
if: runner.os != 'Windows'
shell: bash
run: |
ref=${{ github.ref }}
refversion=${ref#"refs/tags/enso-"}
binversion=${{ env.DIST_VERSION }}
test $binversion = $refversion || (echo "Tag version $refversion and the binary version $binversion do not match" && false)
engineversion=$(${{ env.ENGINE_DIST_DIR }}/bin/enso --version --json | jq -r '.version')
test $binversion = $refversion || (echo "Tag version $refversion and the launcher version $binversion do not match" && false)
test $engineversion = $refversion || (echo "Tag version $refversion and the engine version $engineversion do not match" && false)
- name: Check Versions (Windows)
working-directory: repo
if: runner.os == 'Windows'
shell: bash
run: |
ref=${{ github.ref }}
refversion=${ref#"refs/tags/enso-"}
binversion=${{ env.DIST_VERSION }}
engineversion=$(${{ env.ENGINE_DIST_DIR }}/bin/enso.bat --version --json | jq -r '.version')
test $binversion = $refversion || (echo "Tag version $refversion and the launcher version $binversion do not match" && false)
test $engineversion = $refversion || (echo "Tag version $refversion and the engine version $engineversion do not match" && false)
# Publish
- name: Upload the Engine Artifact
uses: actions/upload-artifact@v2
with:
name: ${{ env.ENGINE_DIST_ROOT }}
path: repo/${{ env.ENGINE_DIST_ROOT }}
- name: Upload the Launcher Artifact
uses: actions/upload-artifact@v2
with:
name: ${{ env.DIST_ROOT }}
path: repo/${{ env.DIST_ROOT }}
name: ${{ env.LAUNCHER_DIST_ROOT }}
path: repo/${{ env.LAUNCHER_DIST_ROOT }}
- name: Upload the Manifest Artifact
uses: actions/upload-artifact@v2
with:
name: manifest
path: repo/manifest.yaml
create-release:
name: Prepare Release
runs-on: ubuntu-latest
needs: [build-engine, build-launcher]
needs: build
steps:
- name: Checkout code
uses: actions/checkout@v2
@ -241,11 +234,11 @@ jobs:
path: artifacts
# This jobs can be used to debug errors, it may be removed
- name: Display structure of downloaded files
- name: Display Structure of Downloaded Files
run: ls -R
working-directory: artifacts
- name: Save version to environment
- name: Save Version to Environment
shell: bash
run: |
ref=${{ github.ref }}
@ -277,8 +270,10 @@ jobs:
- name: Fix Package Structure
shell: bash
run: |
chmod +x artifacts/enso-engine-${{ env.DIST_VERSION }}/enso-${{ env.DIST_VERSION }}/bin/enso
chmod +x artifacts/enso-engine-${{ env.DIST_VERSION }}/enso-${{ env.DIST_VERSION }}/bin/project-manager
chmod +x artifacts/enso-engine-${{ env.DIST_VERSION }}-linux-amd64/enso-${{ env.DIST_VERSION }}/bin/enso
chmod +x artifacts/enso-engine-${{ env.DIST_VERSION }}-linux-amd64/enso-${{ env.DIST_VERSION }}/bin/project-manager
chmod +x artifacts/enso-engine-${{ env.DIST_VERSION }}-macos-amd64/enso-${{ env.DIST_VERSION }}/bin/enso
chmod +x artifacts/enso-engine-${{ env.DIST_VERSION }}-macos-amd64/enso-${{ env.DIST_VERSION }}/bin/project-manager
chmod +x artifacts/enso-launcher-${{ env.DIST_VERSION }}-linux-amd64/enso/bin/enso
chmod +x artifacts/enso-launcher-${{ env.DIST_VERSION }}-macos-amd64/enso/bin/enso
mkdir artifacts/enso-launcher-${{ env.DIST_VERSION }}-linux-amd64/enso/config
@ -294,8 +289,12 @@ jobs:
- name: Prepare Packages
shell: bash
run: |
(cd artifacts/enso-engine-${{ env.DIST_VERSION }}/ && zip -q -r ../../enso-engine-${{ env.DIST_VERSION }}.zip enso-${{ env.DIST_VERSION }} )
echo "Engine packaged"
(cd artifacts/enso-engine-${{ env.DIST_VERSION }}-linux-amd64/ && tar -czf ../../enso-engine-${{ env.DIST_VERSION }}-linux-amd64.tar.gz enso-${{ env.DIST_VERSION }} )
echo "Linux Engine packaged"
(cd artifacts/enso-engine-${{ env.DIST_VERSION }}-macos-amd64/ && tar -czf ../../enso-engine-${{ env.DIST_VERSION }}-macos-amd64.tar.gz enso-${{ env.DIST_VERSION }} )
echo "MacOS Engine packaged"
(cd artifacts/enso-engine-${{ env.DIST_VERSION }}-windows-amd64/ && zip -q -r ../../enso-engine-${{ env.DIST_VERSION }}-windows-amd64.zip enso-${{ env.DIST_VERSION }} )
echo "Windows Engine packaged"
(cd artifacts/enso-launcher-${{ env.DIST_VERSION }}-linux-amd64/ && tar -czf ../../enso-launcher-${{ env.DIST_VERSION }}-linux-amd64.tar.gz enso )
echo "Linux Launcher packaged"
(cd artifacts/enso-launcher-${{ env.DIST_VERSION }}-macos-amd64/ && tar -czf ../../enso-launcher-${{ env.DIST_VERSION }}-macos-amd64.tar.gz enso )
@ -306,9 +305,9 @@ jobs:
- name: Prepare Bundles
shell: bash
run: |
cp -r artifacts/enso-engine-${{ env.DIST_VERSION }}/enso-${{ env.DIST_VERSION }} artifacts/enso-launcher-${{ env.DIST_VERSION }}-linux-amd64/enso/dist/${{ env.DIST_VERSION }}
cp -r artifacts/enso-engine-${{ env.DIST_VERSION }}/enso-${{ env.DIST_VERSION }} artifacts/enso-launcher-${{ env.DIST_VERSION }}-macos-amd64/enso/dist/${{ env.DIST_VERSION }}
cp -r artifacts/enso-engine-${{ env.DIST_VERSION }}/enso-${{ env.DIST_VERSION }} artifacts/enso-launcher-${{ env.DIST_VERSION }}-windows-amd64/enso/dist/${{ env.DIST_VERSION }}
cp -r artifacts/enso-engine-${{ env.DIST_VERSION }}-linux-amd64/enso-${{ env.DIST_VERSION }} artifacts/enso-launcher-${{ env.DIST_VERSION }}-linux-amd64/enso/dist/${{ env.DIST_VERSION }}
cp -r artifacts/enso-engine-${{ env.DIST_VERSION }}-macos-amd64/enso-${{ env.DIST_VERSION }} artifacts/enso-launcher-${{ env.DIST_VERSION }}-macos-amd64/enso/dist/${{ env.DIST_VERSION }}
cp -r artifacts/enso-engine-${{ env.DIST_VERSION }}-windows-amd64/enso-${{ env.DIST_VERSION }} artifacts/enso-launcher-${{ env.DIST_VERSION }}-windows-amd64/enso/dist/${{ env.DIST_VERSION }}
mv graalvm-linux/graalvm-ce-java${{ env.javaVersion }}-${{ env.graalVersion }} artifacts/enso-launcher-${{ env.DIST_VERSION }}-linux-amd64/enso/runtime
mv graalvm-macos/graalvm-ce-java${{ env.javaVersion }}-${{ env.graalVersion }} artifacts/enso-launcher-${{ env.DIST_VERSION }}-macos-amd64/enso/runtime
mv graalvm-windows/graalvm-ce-java${{ env.javaVersion }}-${{ env.graalVersion }} artifacts/enso-launcher-${{ env.DIST_VERSION }}-windows-amd64/enso/runtime
@ -332,14 +331,32 @@ jobs:
draft: true
prerelease: true
- name: Publish the Engine
- name: Publish the Engine (Linux)
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: enso-engine-${{ env.DIST_VERSION }}.zip
asset_name: enso-engine-${{ env.DIST_VERSION }}.zip
asset_path: enso-engine-${{ env.DIST_VERSION }}-linux-amd64.tar.gz
asset_name: enso-engine-${{ env.DIST_VERSION }}-linux-amd64.tar.gz
asset_content_type: application/x-tar
- name: Publish the Engine (MacOS)
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: enso-engine-${{ env.DIST_VERSION }}-macos-amd64.tar.gz
asset_name: enso-engine-${{ env.DIST_VERSION }}-macos-amd64.tar.gz
asset_content_type: application/x-tar
- name: Publish the Engine (Windows)
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: enso-engine-${{ env.DIST_VERSION }}-windows-amd64.zip
asset_name: enso-engine-${{ env.DIST_VERSION }}-windows-amd64.zip
asset_content_type: application/zip
- name: Publish the Launcher (Linux)

339
.github/workflows/scala.yml vendored
View File

@ -13,6 +13,7 @@ env:
javaVersion: 11
# Please ensure that this is in sync with project/build.properties
sbtVersion: 1.3.13
# Please ensure that this is in sync with rustVersion in build.sbt
rustToolchain: nightly-2019-11-04
excludedPaths: |
.github/PULL_REQUEST_TEMPLATE.md
@ -117,146 +118,8 @@ jobs:
# This job is responsible for building the artifacts
build:
name: Build Engine
runs-on: ubuntu-latest
timeout-minutes: 45
steps:
- name: Checkout (PR)
uses: actions/checkout@v2
if: github.event_name == 'pull_request'
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Checkout (Branch)
uses: actions/checkout@v2
if: github.event_name != 'pull_request'
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ env.rustToolchain }}
override: true
- name: Setup conda
uses: s-weigand/setup-conda@v1
with:
update-conda: true
conda-channels: anaconda, conda-forge
- name: Install FlatBuffers Compiler
run: conda install flatbuffers=1.12.0
- name: Setup GraalVM Environment
uses: ayltai/setup-graalvm@v1
with:
graalvm-version: ${{ env.graalVersion }}
java-version: ${{ env.javaVersion }}
native-image: false
- name: Set Up SBT
run: |
curl -fSL -o sbt.tgz https://piccolo.link/sbt-${{env.sbtVersion}}.tgz
tar -xzf sbt.tgz
echo ::add-path::$GITHUB_WORKSPACE/sbt/bin/
# Caches
- name: Cache SBT
uses: actions/cache@v2
with:
path: |
~/.sbt
~/.ivy2/cache
~/.cache
key: ${{ runner.os }}-sbt-${{ hashFiles('**build.sbt') }}
restore-keys: ${{ runner.os }}-sbt-
# Build Artifacts
- name: Bootstrap the project
run: sbt --no-colors bootstrap
- name: Build the Runtime Uberjar
run: sbt --no-colors runtime/assembly
- name: Build the Runner Uberjar
run: sbt --no-colors runner/assembly
- name: Build the Project Manager Uberjar
run: sbt --no-colors project-manager/assembly
- name: Build the Manifest
run: |
cp distribution/manifest.template.yaml manifest.yaml
echo "graal-vm-version: $graalVersion" >> manifest.yaml
echo "graal-java-version: $javaVersion" >> manifest.yaml
- name: Prepare Distribution
run: |
DIST_VERSION=$(./runner.jar --version --json | jq -r '.version')
DIST_ROOT=enso-engine-$DIST_VERSION
DIST_DIR=$DIST_ROOT/enso-$DIST_VERSION
mkdir -p $DIST_DIR
mkdir $DIST_DIR/component
cp runtime.jar $DIST_DIR/component
mv runner.jar $DIST_DIR/component
mv project-manager.jar $DIST_DIR/component
cp -r distribution/std-lib $DIST_DIR/std-lib
cp -r distribution/bin $DIST_DIR/bin
chmod +x $DIST_DIR/bin/enso
chmod +x $DIST_DIR/bin/project-manager
cp manifest.yaml $DIST_DIR
echo ::set-env name=DIST_ROOT::$DIST_ROOT
echo ::set-env name=DIST_DIR::$DIST_DIR
- name: Build the Parser JS Bundle
run: sbt -no-colors syntaxJS/fullOptJS
# Publish
- name: Publish the Distribution Artifact
uses: actions/upload-artifact@v1.0.0
with:
name: ${{ env.DIST_ROOT }}
path: ${{ env.DIST_ROOT }}
- name: Prepare the FlatBuffers Schemas for Upload
run: |
mkdir fbs-upload
cp -r "engine/language-server/src/main/schema" fbs-upload/fbs-schema/
zip -r -m -ll "fbs-upload/fbs-schema.zip" "fbs-upload/fbs-schema/"
- name: Publish the FlatBuffers Schemas
uses: actions/upload-artifact@v1.0.0
with:
name: Engine Protocol FlatBuffers Schemas
path: ./fbs-upload/fbs-schema.zip
- name: Prepare Parser JS Bundle for Upload
run: |
mkdir parser-upload
cp ./target/scala-parser.js parser-upload
- name: Publish the Parser JS Bundle
uses: actions/upload-artifact@v1.0.0
with:
name: Parser JS Bundle
path: ./target/scala-parser.js
- name: Publish the Manifest
uses: actions/upload-artifact@v2
with:
name: manifest
path: manifest.yaml
- name: Prepare AWS Session
run: |
aws configure --profile s3-upload <<-EOF > /dev/null 2>&1
${{ secrets.ARTEFACT_S3_ACCESS_KEY_ID }}
${{ secrets.ARTEFACT_S3_SECRET_ACCESS_KEY }}
us-west-2
text
EOF
- name: Upload Parser JS Bundle to S3
run: |
aws s3 sync ./parser-upload s3://packages-luna/parser-js/nightly/`git rev-parse HEAD` --profile s3-upload --acl public-read --delete
- name: Upload FlatBuffers Schemas to S3
run: |
aws s3 sync ./fbs-upload s3://packages-luna/fbs-schema/nightly/`git rev-parse HEAD` --profile s3-upload --acl public-read --delete
- name: Upload Distribution to S3
run: |
aws s3 sync ${{ env.DIST_DIR }} s3://packages-luna/project-manager/nightly/`git rev-parse HEAD` --profile s3-upload --acl public-read --delete
- name: Teardown AWS Session
run: |
aws configure --profile s3-upload <<-EOF > /dev/null 2>&1
null
null
null
text
EOF
build-launcher:
name: Build Launcher
runs-on: ${{ matrix.os }}
timeout-minutes: 30
timeout-minutes: 45
strategy:
matrix:
os: [macOS-latest, ubuntu-latest, windows-latest]
@ -270,19 +133,34 @@ jobs:
- name: Checkout (Branch)
uses: actions/checkout@v2
if: github.event_name != 'pull_request'
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ env.rustToolchain }}
override: true
- name: Enable Developer Command Prompt (Windows)
uses: ilammy/msvc-dev-cmd@v1.3.0
- name: Setup conda
uses: s-weigand/setup-conda@v1
with:
update-conda: true
conda-channels: anaconda, conda-forge
- name: Setup Conda Environment on Windows
if: runner.os == 'Windows'
run: |
conda create --name enso
conda init powershell
- name: Activate Conda Environment on Windows
if: runner.os == 'Windows'
run: conda activate enso
- name: Install FlatBuffers Compiler
run: conda install flatbuffers=1.12.0
- name: Setup GraalVM Environment
uses: ayltai/setup-graalvm@v1
with:
graalvm-version: ${{ env.graalVersion }}
java-version: ${{ env.javaVersion }}
native-image: true
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ env.rustToolchain }}
override: true
- name: Set Up SBT
run: |
curl -fSL -o sbt.tgz https://piccolo.link/sbt-${{env.sbtVersion}}.tgz
@ -301,64 +179,173 @@ jobs:
restore-keys: ${{ runner.os }}-sbt-
# Build Artifacts
#- name: Bootstrap the project # As long as launcher doesn't depend on
# # runtime, bootstrap is not mandatory.
# run: sbt --no-colors bootstrap
- name: Build Launcher Native Image
- name: Bootstrap the Project
run: sbt --no-colors bootstrap
- name: Build the Runtime Uberjar
run: sbt --no-colors runtime/assembly
- name: Build the Runner Uberjar
run: sbt --no-colors runner/assembly
- name: Build the Project Manager Uberjar
run: sbt --no-colors project-manager/assembly
- name: Build the Launcher Native Image
run: sbt --no-colors launcher/buildNativeImage
- name: Build the Manifest
run: |
cp distribution/manifest.template.yaml manifest.yaml
echo "graal-vm-version: $graalVersion" >> manifest.yaml
echo "graal-java-version: $javaVersion" >> manifest.yaml
- name: Build the Parser JS Bundle
# The builds are run on 3 platforms, but Flatbuffer schemas are platform
# agnostic, so they just need to be uploaded from one of the runners.
if: runner.os == 'Linux'
run: sbt -no-colors syntaxJS/fullOptJS
# Publish
- name: Prepare distribution directory name (Unix)
# Prepare distributions
- name: Prepare Distribution Version (Unix)
if: runner.os != 'Windows'
shell: bash
run: |
chmod +x enso
DIST_VERSION=$(./enso version --json | jq -r '.version')
DIST_ROOT=enso-launcher-$DIST_VERSION-$(echo ${{ runner.os }} | awk '{print tolower($0)}')-amd64
DIST_DIR=$DIST_ROOT/enso
echo ::set-env name=DIST_VERSION::$DIST_VERSION
echo ::set-env name=DIST_DIR::$DIST_DIR
echo ::set-env name=DIST_ROOT::$DIST_ROOT
- name: Prepare distribution directory name (Windows)
- name: Prepare Distribution Version (Windows)
if: runner.os == 'Windows'
shell: bash
run: |
DIST_VERSION=$(./enso.exe version --json | jq -r '.version')
DIST_ROOT=enso-launcher-$DIST_VERSION-$(echo ${{ runner.os }} | awk '{print tolower($0)}')-amd64
DIST_DIR=$DIST_ROOT/enso
echo ::set-env name=DIST_VERSION::$DIST_VERSION
echo ::set-env name=DIST_DIR::$DIST_DIR
echo ::set-env name=DIST_ROOT::$DIST_ROOT
- name: Prepare Launcher distribution (common)
# Currently the only architecture supported by Github runners is amd64
- name: Prepare Distribution Environment
shell: bash
run: |
mkdir -p ${{ env.DIST_DIR }}
mkdir ${{ env.DIST_DIR }}/bin
mkdir ${{ env.DIST_DIR }}/dist
mkdir ${{ env.DIST_DIR }}/runtime
cp distribution/launcher/.enso.portable ${{ env.DIST_DIR }}
cp distribution/launcher/README.md ${{ env.DIST_DIR }}
cp distribution/launcher/NOTICE ${{ env.DIST_DIR }}
cp -r distribution/launcher/components-licences ${{ env.DIST_DIR }}
DIST_ARCH=amd64
DIST_OS=$(echo ${{ runner.os }} | awk '{print tolower($0)}')
LAUNCHER_DIST_ROOT=enso-launcher-$DIST_VERSION-$DIST_OS-$DIST_ARCH
LAUNCHER_DIST_DIR=$LAUNCHER_DIST_ROOT/enso
ENGINE_DIST_ROOT=enso-engine-$DIST_VERSION-$DIST_OS-$DIST_ARCH
ENGINE_DIST_DIR=$ENGINE_DIST_ROOT/enso-$DIST_VERSION
echo ::set-env name=LAUNCHER_DIST_DIR::$LAUNCHER_DIST_DIR
echo ::set-env name=LAUNCHER_DIST_ROOT::$LAUNCHER_DIST_ROOT
echo ::set-env name=ENGINE_DIST_DIR::$ENGINE_DIST_DIR
echo ::set-env name=ENGINE_DIST_ROOT::$ENGINE_DIST_ROOT
- name: Prepare Launcher distribution (Unix)
if: runner.os != 'Windows'
- name: Prepare Launcher Distribution (Common)
shell: bash
run: |
cp enso ${{ env.DIST_DIR }}/bin/
mkdir -p ${{ env.LAUNCHER_DIST_DIR }}
mkdir ${{ env.LAUNCHER_DIST_DIR }}/bin
mkdir ${{ env.LAUNCHER_DIST_DIR }}/dist
mkdir ${{ env.LAUNCHER_DIST_DIR }}/runtime
cp distribution/launcher/.enso.portable ${{ env.LAUNCHER_DIST_DIR }}
cp distribution/launcher/README.md ${{ env.LAUNCHER_DIST_DIR }}
cp distribution/launcher/NOTICE ${{ env.LAUNCHER_DIST_DIR }}
cp -r distribution/launcher/components-licences ${{ env.LAUNCHER_DIST_DIR }}
- name: Prepare Launcher distribution (Windows)
- name: Prepare Launcher Distribution (Unix)
if: runner.os != 'Windows'
shell: bash
run: |
cp enso ${{ env.LAUNCHER_DIST_DIR }}/bin/
- name: Prepare Launcher Distribution (Windows)
if: runner.os == 'Windows'
shell: bash
run: |
cp enso.exe ${{ env.DIST_DIR }}/bin/
cp enso.exe ${{ env.LAUNCHER_DIST_DIR }}/bin/
# The way artifacts are uploaded currently does not preserve the
# executable bits for Unix. However putting artifacts into a ZIP would
# create a twice nested ZIP file. For now, users downloading artifacts
# from the CI builds have to set the bit themselves.
# So the following two lines have been removed from this step, as they do
# nothing useful:
# chmod +x $ENGINE_DIST_DIR/bin/enso
# chmod +x $ENGINE_DIST_DIR/bin/project-manager
- name: Prepare Engine Distribution
shell: bash
run: |
mkdir -p $ENGINE_DIST_DIR
mkdir $ENGINE_DIST_DIR/component
cp runtime.jar $ENGINE_DIST_DIR/component
mv runner.jar $ENGINE_DIST_DIR/component
mv project-manager.jar $ENGINE_DIST_DIR/component
cp -r distribution/std-lib $ENGINE_DIST_DIR/std-lib
cp -r distribution/bin $ENGINE_DIST_DIR/bin
cp manifest.yaml $ENGINE_DIST_DIR
# Publish
- name: Publish the Engine Distribution Artifact
uses: actions/upload-artifact@v1.0.0
with:
name: ${{ env.ENGINE_DIST_ROOT }}
path: ${{ env.ENGINE_DIST_ROOT }}
- name: Publish the Launcher Binary
uses: actions/upload-artifact@v2
with:
name: ${{ env.DIST_ROOT }}
path: ${{ env.DIST_ROOT }}
name: ${{ env.LAUNCHER_DIST_ROOT }}
path: ${{ env.LAUNCHER_DIST_ROOT }}
- name: Prepare the FlatBuffers Schemas for Upload
# The builds are run on 3 platforms, but Flatbuffer schemas are platform
# agnostic, so they just need to be uploaded from one of the runners.
if: runner.os == 'Linux'
run: |
mkdir fbs-upload
cp -r "engine/language-server/src/main/schema" fbs-upload/fbs-schema/
zip -r -m -ll "fbs-upload/fbs-schema.zip" "fbs-upload/fbs-schema/"
- name: Publish the FlatBuffers Schemas
if: runner.os == 'Linux'
uses: actions/upload-artifact@v1.0.0
with:
name: Engine Protocol FlatBuffers Schemas
path: ./fbs-upload/fbs-schema.zip
- name: Prepare Parser JS Bundle for Upload
if: runner.os == 'Linux'
run: |
mkdir parser-upload
cp ./target/scala-parser.js parser-upload
- name: Publish the Parser JS Bundle
if: runner.os == 'Linux'
uses: actions/upload-artifact@v1.0.0
with:
name: Parser JS Bundle
path: ./target/scala-parser.js
- name: Publish the Manifest
if: runner.os == 'Linux'
uses: actions/upload-artifact@v2
with:
name: manifest
path: manifest.yaml
# Publish FlatBuffer Schemas and Parser Bundle to S3
- name: Prepare AWS Session
shell: bash
if: runner.os == 'Linux'
run: |
aws configure --profile s3-upload <<-EOF > /dev/null 2>&1
${{ secrets.ARTEFACT_S3_ACCESS_KEY_ID }}
${{ secrets.ARTEFACT_S3_SECRET_ACCESS_KEY }}
us-west-2
text
EOF
- name: Upload Parser JS Bundle to S3
shell: bash
if: runner.os == 'Linux'
run: |
aws s3 sync ./parser-upload s3://packages-luna/parser-js/nightly/`git rev-parse HEAD` --profile s3-upload --acl public-read --delete
- name: Upload FlatBuffers Schemas to S3
shell: bash
if: runner.os == 'Linux'
run: |
aws s3 sync ./fbs-upload s3://packages-luna/fbs-schema/nightly/`git rev-parse HEAD` --profile s3-upload --acl public-read --delete
- name: Teardown AWS Session
shell: bash
if: runner.os == 'Linux'
run: |
aws configure --profile s3-upload <<-EOF > /dev/null 2>&1
null
null
null
text
EOF

80
build.sbt
View File

@ -17,9 +17,19 @@ import com.typesafe.sbt.license.DepModuleInfo
// ============================================================================
val scalacVersion = "2.13.3"
val rustVersion = "1.40.0-nightly (b520af6fd 2019-11-03)"
val graalVersion = "20.1.0"
val javaVersion = "11"
val ensoVersion = "0.1.0"
val ensoVersion = "0.1.0" // Note [Engine And Launcher Version]
/* Note [Engine And Launcher Version]
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Currently both Engine and Launcher versions are tied to each other - each new
* releases contains the Engine and the Launcher and thus the version number is
* shared. If the version numbers ever diverge, make sure tu update the build
* scripts at .github/workflows accordingly.
*/
organization in ThisBuild := "org.enso"
scalaVersion in ThisBuild := scalacVersion
val licenseSettings = Seq(
@ -295,30 +305,29 @@ val zio = Seq(
// === Other ==================================================================
val bcpkixJdk15Version = "1.65"
val declineVersion = "1.2.0"
val directoryWatcherVersion = "0.9.10"
val flatbuffersVersion = "1.12.0"
val guavaVersion = "29.0-jre"
val jlineVersion = "3.15.0"
val kindProjectorVersion = "0.11.0"
val mockitoScalaVersion = "1.14.8"
val newtypeVersion = "0.4.4"
val pprintVersion = "0.5.9"
val pureconfigVersion = "0.13.0"
val refinedVersion = "0.9.14"
val rustVersion = "1.40.0-nightly (b520af6fd 2019-11-03)"
val scalacheckVersion = "1.14.3"
val scalacticVersion = "3.3.0-SNAP2"
val scalaLoggingVersion = "3.9.2"
val scalameterVersion = "0.19"
val scalatagsVersion = "0.9.1"
val scalatestVersion = "3.3.0-SNAP2"
val shapelessVersion = "2.4.0-M1"
val slickVersion = "3.3.2"
val sqliteVersion = "3.31.1"
val tikaVersion = "1.24.1"
val typesafeConfigVersion = "1.4.0"
val bcpkixJdk15Version = "1.65"
val declineVersion = "1.2.0"
val directoryWatcherVersion = "0.9.10"
val flatbuffersVersion = "1.12.0"
val guavaVersion = "29.0-jre"
val jlineVersion = "3.15.0"
val kindProjectorVersion = "0.11.0"
val mockitoScalaVersion = "1.14.8"
val newtypeVersion = "0.4.4"
val pprintVersion = "0.5.9"
val pureconfigVersion = "0.13.0"
val refinedVersion = "0.9.14"
val scalacheckVersion = "1.14.3"
val scalacticVersion = "3.3.0-SNAP2"
val scalaLoggingVersion = "3.9.2"
val scalameterVersion = "0.19"
val scalatagsVersion = "0.9.1"
val scalatestVersion = "3.3.0-SNAP2"
val shapelessVersion = "2.4.0-M1"
val slickVersion = "3.3.2"
val sqliteVersion = "3.31.1"
val tikaVersion = "1.24.1"
val typesafeConfigVersion = "1.4.0"
// ============================================================================
// === Internal Libraries =====================================================
@ -765,7 +774,7 @@ lazy val `language-server` = (project in file("engine/language-server"))
testOptions in Test += Tests
.Argument(TestFrameworks.ScalaCheck, "-minSuccessfulTests", "1000"),
GenerateFlatbuffers.flatcVersion := flatbuffersVersion,
sourceGenerators in Compile += GenerateFlatbuffers.task,
sourceGenerators in Compile += GenerateFlatbuffers.task
)
.configs(Benchmark)
.settings(
@ -787,6 +796,7 @@ lazy val `language-server` = (project in file("engine/language-server"))
lazy val ast = (project in file("lib/scala/ast"))
.settings(
version := ensoVersion,
GenerateAST.rustVersion := rustVersion,
Compile / sourceGenerators += GenerateAST.task,
)
@ -817,7 +827,7 @@ lazy val runtime = (project in file("engine/runtime"))
"org.graalvm.truffle" % "truffle-api" % graalVersion % Benchmark,
"org.typelevel" %% "cats-core" % catsVersion,
"eu.timepit" %% "refined" % refinedVersion
),
),
// Note [Unmanaged Classpath]
Compile / unmanagedClasspath += (`core-definition` / Compile / packageBin).value,
Test / unmanagedClasspath += (`core-definition` / Compile / packageBin).value,
@ -835,7 +845,6 @@ lazy val runtime = (project in file("engine/runtime"))
),
bootstrap := CopyTruffleJAR.bootstrapJARs.value,
Global / onLoad := EnvironmentCheck.addVersionCheck(
rustVersion,
graalVersion,
javaVersion
)((Global / onLoad).value)
@ -895,7 +904,6 @@ lazy val runtime = (project in file("engine/runtime"))
.dependsOn(`polyglot-api`)
.dependsOn(`text-buffer`)
.dependsOn(`searcher`)
.dependsOn(ast)
/* Note [Unmanaged Classpath]
* ~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -954,13 +962,13 @@ lazy val runner = project
commands += WithDebugCommand.withDebug,
inConfig(Compile)(truffleRunOptionsSettings),
libraryDependencies ++= Seq(
"org.graalvm.sdk" % "polyglot-tck" % graalVersion % "provided",
"org.graalvm.truffle" % "truffle-api" % graalVersion % "provided",
"commons-cli" % "commons-cli" % commonsCliVersion,
"com.monovore" %% "decline" % declineVersion,
"org.jline" % "jline" % jlineVersion,
"org.typelevel" %% "cats-core" % catsVersion,
"com.typesafe.slick" %% "slick-hikaricp" % slickVersion % Runtime
"org.graalvm.sdk" % "polyglot-tck" % graalVersion % "provided",
"org.graalvm.truffle" % "truffle-api" % graalVersion % "provided",
"commons-cli" % "commons-cli" % commonsCliVersion,
"com.monovore" %% "decline" % declineVersion,
"org.jline" % "jline" % jlineVersion,
"org.typelevel" %% "cats-core" % catsVersion,
"com.typesafe.slick" %% "slick-hikaricp" % slickVersion % Runtime
),
connectInput in run := true
)

6
distribution/bin/enso.bat
View File

@ -1,3 +1,3 @@
set comp-dir=%~dp0\..\component
java -jar -Dtruffle.class.path.append=%comp-dir%\runtime.jar -Dpolyglot.engine.IterativePartialEscape=true %JAVA_OPTS% %comp-dir%\runner.jar %*
exit /B %errorlevel%
@set comp-dir=%~dp0\..\component
@java -jar -Dtruffle.class.path.append=%comp-dir%\runtime.jar -Dpolyglot.engine.IterativePartialEscape=true %JAVA_OPTS% %comp-dir%\runner.jar %*
@exit /B %errorlevel%

6
distribution/bin/project-manager.bat
View File

@ -1,3 +1,3 @@
set comp-dir=%~dp0\..\component
java -jar -Dtruffle.class.path.append=%comp-dir%\runtime.jar %JAVA_OPTS% %comp-dir%\project-manager.jar %*
exit /B %errorlevel%
@set comp-dir=%~dp0\..\component
@java -jar -Dtruffle.class.path.append=%comp-dir%\runtime.jar %JAVA_OPTS% %comp-dir%\project-manager.jar %*
@exit /B %errorlevel%

12
docs/distribution/release-policy.md
View File

@ -126,12 +126,14 @@ for each supported platform. Moreover, for convenience, it should include
bundles containing native launcher binaries and the latest engine build for each
platform. So each release should contain the following assets:
- `enso-bundle-<version>-linux-amd64.zip`
- `enso-bundle-<version>-macos-amd64.zip`
- `enso-bundle-<version>-linux-amd64.tar.gz`
- `enso-bundle-<version>-macos-amd64.tar.gz`
- `enso-bundle-<version>-windows-amd64.zip`
- `enso-engine-<version>.zip`
- `enso-launcher-<version>-linux-amd64.zip`
- `enso-launcher-<version>-macos-amd64.zip`
- `enso-engine-<version>-linux-amd64.tar.gz`
- `enso-engine-<version>-macos-amd64.tar.gz`
- `enso-engine-<version>-windows-amd64.zip`
- `enso-launcher-<version>-linux-amd64.tar.gz`
- `enso-launcher-<version>-macos-amd64.tar.gz`
- `enso-launcher-<version>-windows-amd64.zip`
- `manifest.yaml`

5
project/EnvironmentCheck.scala
View File

@ -86,7 +86,6 @@ object EnvironmentCheck {
/**
* Augments a state transition to do a Rust and GraalVM version check.
*
* @param rustVersion the Rust version that is expected to be installed
* @param graalVersion the GraalVM version that should be used for
* building this project
* @param javaVersion the Java version of the used GraalVM distribution
@ -95,7 +94,6 @@ object EnvironmentCheck {
* oldTransition but also runs the version checks
*/
def addVersionCheck(
rustVersion: String,
graalVersion: String,
javaVersion: String
)(
@ -105,8 +103,7 @@ object EnvironmentCheck {
val newState = oldTransition(state)
val logger = newState.log
val graalOk = graalVersionOk(graalVersion, javaVersion, logger)
val rustOk = rustVersionOk(rustVersion, logger)
if (!graalOk || !rustOk)
if (!graalOk)
throw new RuntimeException("Some versions checks failed.")
newState

3
project/GenerateAST.scala
View File

@ -18,6 +18,9 @@ object GenerateAST {
val output = sourceManaged.value / "main/org/enso/ast/Ast.scala"
val cache = streams.value.cacheStoreFactory.make("ast_source")
if (!EnvironmentCheck.rustVersionOk(rustVersion.value, log))
throw new RuntimeException("Rust version mismatch!")
Tracked.diffInputs(cache, FileInfo.lastModified)(Set(source))
{ source: ChangeReport[File] =>
if (source.modified.nonEmpty) {