diff --git a/.gitignore b/.gitignore index 6782ebc900b..4bf016557dd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,6 @@ .dvm /result* -nix/dev-in-nix - **/*~ **/_build **/_output diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index da8573475b7..00000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,35 +0,0 @@ -pipeline { - agent any - stages { - stage ('git submodule') { - steps { - sh 'git submodule update --init --recursive' - sh 'git clone --recursive git@github.com:dfinity-lab/dev nix/dev' - sh 'git -C nix/dev checkout e588f0efa687667076dfab52fddde6ff29e0d82c' - sh 'git -C nix/dev submodule update --init --recursive' - } - } - - stage('Build (native)') { - steps { - sh 'nix-build -A native --arg test-dvm true' - } - } - stage('Test (native)') { - steps { - sh 'nix-build -A native_test --arg test-dvm true' - } - } - stage('Build and test (js)') { - steps { - sh 'nix-build -A js' - } - } - } - // Workspace Cleanup plugin - post { - always { - cleanWs() - } - } -} diff --git a/README.md b/README.md index 6496b1afd84..7bf10ac6076 100644 --- a/README.md +++ b/README.md @@ -13,21 +13,6 @@ To install the `asc` binary into your nix environment, use $ nix-env -i -f . -A native ``` -## Setup of `dev` - -Until we join the monorepo, we need a checkout the `dev` repository in -`nix/dev`; see the `Jenkinsfile` the precise revision to use. - -For a fresh checkout, run -``` -git clone --recursive git@github.com:dfinity-lab/dev nix/dev -git -C nix/dev checkout 2bc6…see…Jenkinsfile…fecd -git -C nix/dev submodule update --init --recursive -``` - -To update, just run the last two commands again. - - ## Development using Nix This is the command that should always pass on master is the following, which builds everything: @@ -78,16 +63,8 @@ installing all required tools without nix is out of scope). nix-env -i -f . -A wasm nix-env -i -f . -A filecheck nix-env -i -f . -A wabt - ``` - * Install the `dvm` tool, using - ``` nix-env -i -f . -A dvm ``` - or simply - ``` - ./update-dvm.sh - ``` - which also updates the `dev` checkout. ## Create a coverage report diff --git a/ci.nix b/ci.nix index 7453ecd04e5..e861ec7c2d9 100644 --- a/ci.nix +++ b/ci.nix @@ -1,4 +1 @@ -# We need to set test-dvm to false because hydra has -# no access to the `dev` repo. This can go away once we join -# the monorepo. -import ./default.nix { test-dvm = false; } +import ./default.nix { } diff --git a/default.nix b/default.nix index c843d6a9560..f3e72122286 100644 --- a/default.nix +++ b/default.nix @@ -30,12 +30,13 @@ let real-dvm = then if test-dvm then - if !builtins.pathExists ./nix/dev/default.nix - then - throw "\"test-dvm = true\" requires a checkout of dev in ./nix.\nSee Jenkinsfile for the required revision. " - else - # Pass devel = true until the dev test suite runs on MacOS again - ((import ./nix/dev) { devel = true; }).dvm + let dev = builtins.fetchGit { + url = "ssh://git@github.com/dfinity-lab/dev"; + rev = "1ab8900eafb3a588372a9d71294df75b504539eb"; + ref = "master"; + }; in + # Pass devel = true until the dev test suite runs on MacOS again + (import dev { devel = true; }).dvm else null else dvm; in @@ -106,7 +107,7 @@ rec { nixpkgs.wabt nixpkgs.bash nixpkgs.perl - filecheck + filecheck ] ++ (if test-dvm then [ real-dvm ] else []); diff --git a/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok b/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok index 4a1af3b7fa5..e6d1727cfb6 100644 --- a/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok +++ b/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok @@ -1,2 +1,3 @@ W, hypervisor: call failed with trap message: Uncaught RuntimeError: unreachable +W, hypervisor: call failed with trap message: Uncaught RuntimeError: unreachable Top-level code done. diff --git a/test/run-dfinity/ok/flatten-awaitables.dvm-run.ok b/test/run-dfinity/ok/flatten-awaitables.dvm-run.ok index 84cb71c9839..c8ab234ed8e 100644 --- a/test/run-dfinity/ok/flatten-awaitables.dvm-run.ok +++ b/test/run-dfinity/ok/flatten-awaitables.dvm-run.ok @@ -1,7 +1,6 @@ +Top-level code done. -# -# Fatal error in v8::ToLocalChecked -# Empty MaybeLocal. -# - -dvm.sh: line 14: Illegal instruction dvm $@ +first-order +,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, +higher-order +,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, diff --git a/test/run-dfinity/ok/overflow.dvm-run.ok b/test/run-dfinity/ok/overflow.dvm-run.ok index 501d4e74886..5db4566da42 100644 --- a/test/run-dfinity/ok/overflow.dvm-run.ok +++ b/test/run-dfinity/ok/overflow.dvm-run.ok @@ -1,4 +1,5 @@ W, hypervisor: call failed with trap message: Uncaught RuntimeError: unreachable +W, hypervisor: call failed with trap message: Uncaught RuntimeError: unreachable Top-level code done. This is reachable. This is reachable. diff --git a/update-dvm.sh b/update-dvm.sh deleted file mode 100755 index 4e4aa39362d..00000000000 --- a/update-dvm.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -# This is a small convenience script that ensures that `nix/dev` is up-to-date - -set -e - -if [ ! -e nix/dev ] -then git clone --recursive git@github.com:dfinity-lab/dev nix/dev -else git -C nix/dev fetch -fi -$(grep checkout Jenkinsfile |cut -d\' -f2) -git -C nix/dev submodule update --init --recursive -nix-env -i -f . -A dvm