diff options
| author | Yann Herklotz <ymherklotz@gmail.com> | 2018-03-06 07:36:38 +0000 |
|---|---|---|
| committer | Yann Herklotz <ymherklotz@gmail.com> | 2018-03-06 07:36:38 +0000 |
| commit | e53835f23fd81d8b154f6a7f6b25655ff9dc0043 (patch) | |
| tree | 2e8cd815e3c2f7de3fe79e8b33009cc9d5c21db4 | |
| parent | cdf0bb6e8512ec0784a0076ea5f213bc26990929 (diff) | |
| download | FMark-e53835f23fd81d8b154f6a7f6b25655ff9dc0043.tar.gz FMark-e53835f23fd81d8b154f6a7f6b25655ff9dc0043.zip | |
Reverting and removing js build from travis
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | FMark/.paket/Paket.Restore.targets | 4 | ||||
| -rwxr-xr-x | build.sh | 26 |
3 files changed, 15 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml index 1551688..1b090c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,3 @@ mono: none dotnet: 2.1.4 script: - ${TRAVIS_BUILD_DIR}/build.sh -install: - - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - - - sudo apt-get -qq update - - sudo apt-get install -y git autoconf libtool automake build-essential mono-devel gettext cmake yarn diff --git a/FMark/.paket/Paket.Restore.targets b/FMark/.paket/Paket.Restore.targets index eab405f..e7c1bc0 100644 --- a/FMark/.paket/Paket.Restore.targets +++ b/FMark/.paket/Paket.Restore.targets @@ -17,7 +17,7 @@ <PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe')">$(PaketRootPath)paket.exe</PaketExePath> <PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath> <PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand> - <PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) "$(PaketExePath)"</PaketCommand> + <PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand> <!-- .net core fdd --> <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension> @@ -29,7 +29,7 @@ <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath> <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath> <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand> - <PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) "$(PaketBootStrapperExePath)"</PaketBootStrapperCommand> + <PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)"</PaketBootStrapperCommand> <!-- Disable automagic references for F# dotnet sdk --> <!-- This will not do anything for other project types --> @@ -11,24 +11,24 @@ if [[ -z $TRAVIS_BUILD_DIR ]]; then else echo "Running on travis-ci" BASE_DIR=$TRAVIS_BUILD_DIR - echo "Compiling mono from source" - git clone -b mono-5.13.0.308 https://github.com/mono/mono.git - cd mono - ./autogen.sh --prefix=$PREFIX >/dev/null - make >/dev/null - make install >/dev/null - mono --version + # echo "Compiling mono from source" + # git clone -b mono-5.13.0.308 https://github.com/mono/mono.git + # cd mono + # ./autogen.sh --prefix=$PREFIX >/dev/null + # make >/dev/null + # make install >/dev/null + # mono --version fi -echo "Downloading paket.exe directly" -curl https://github.com/fsprojects/Paket/releases/download/5.148.0/paket.exe -o $BASE_DIR/FMark/.paket/paket.exe +# echo "Downloading paket.exe directly" +# curl https://github.com/fsprojects/Paket/releases/download/5.148.0/paket.exe -o $BASE_DIR/FMark/.paket/paket.exe echo "Running F# tests" cd $BASE_DIR/FMark/src/FMarkCLI dotnet build -v n dotnet run --no-build -- -t -echo "Running javascript build" -cd $BASE_DIR/FMark/src/FMarkFable -dotnet restore -dotnet fable yarn-build +# echo "Running javascript build" +# cd $BASE_DIR/FMark/src/FMarkFable +# dotnet restore +# dotnet fable yarn-build |