Skip to content

Commit 7a8c234

Browse files
committed
Install evmone for testing.
1 parent e4ecbdb commit 7a8c234

3 files changed

+38
-8
lines changed

.circleci/config.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ jobs:
539539
- run: systeminfo
540540
- run:
541541
name: "Installing dependencies"
542-
command: .\.circleci\win_install_dependencies.ps1
542+
command: .\.circleci\win_install_build_dependencies.ps1
543543
- run:
544544
name: "Building Solidity"
545545
command: .\scripts\ci\build_windows.ps1
@@ -562,6 +562,9 @@ jobs:
562562
- checkout
563563
- attach_workspace:
564564
at: build
565+
- run:
566+
name: "Installing dependencies"
567+
command: .\.circleci\win_install_test_dependencies.ps1
565568
- run:
566569
name: "Running soltest"
567570
command: .\build\test\Release\soltest.exe --show-progress -- --testpath .\test --no-smt --evmonepath=evmone\bin\evmone.dll

.circleci/win_install_dependencies.ps1 .circleci/win_install_build_dependencies.ps1

-7
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,10 @@ $cmake_version = "3.16.4"
3030
$cmake_url = "https://github.com/Kitware/CMake/releases/download/v${cmake_version}/cmake-${cmake_version}-win64-x64.zip"
3131
$cmake_archive = "$Env:HOMEPATH\cmake-${cmake_version}-win64-x64.zip"
3232

33-
$evmone_version = "0.5.0"
34-
$evmone_url = "https://github.com/ethereum/evmone/releases/download/v${evmone_version}/evmone-${evmone_version}-windows-amd64.zip"
35-
$evmone_archive = "$Env:HOME\evmone.zip"
36-
3733
Invoke-WebRequest -URI "$cmake_url" -OutFile "$cmake_archive"
3834
Expand-Archive "$cmake_archive" -DestinationPath "$Env:ProgramFiles"
3935
Rename-Item "$Env:ProgramFiles\cmake-${cmake_version}-win64-x64" -NewName CMake
4036
$env:Path = "$Env:ProgramFiles\CMake\bin;$env:Path";
4137

42-
Invoke-WebRequest -URI "$evmone_url" -OutFile "$evmone_archive"
43-
Expand-Archive "$evmone_archive" -DestinationPath evmone
44-
4538
# This will install boost-1.67
4639
cmake -P scripts\install_deps.cmake
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# This file is solely used for building Solidity on CircleCI
2+
# and does not intend to be a general purpose installation script.
3+
#
4+
# The documentation for solidity is hosted at:
5+
#
6+
# https://solidity.readthedocs.org
7+
#
8+
# ------------------------------------------------------------------------------
9+
# This file is part of solidity.
10+
#
11+
# solidity is free software: you can redistribute it and/or modify
12+
# it under the terms of the GNU General Public License as published by
13+
# the Free Software Foundation, either version 3 of the License, or
14+
# (at your option) any later version.
15+
#
16+
# solidity is distributed in the hope that it will be useful,
17+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
18+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+
# GNU General Public License for more details.
20+
#
21+
# You should have received a copy of the GNU General Public License
22+
# along with solidity. If not, see <http://www.gnu.org/licenses/>
23+
#
24+
# (c) 2020 solidity contributors.
25+
#------------------------------------------------------------------------------
26+
27+
$ProgressPreference = "SilentlyContinue"
28+
29+
$evmone_version = "0.5.0"
30+
$evmone_url = "https://github.com/ethereum/evmone/releases/download/v${evmone_version}/evmone-${evmone_version}-windows-amd64.zip"
31+
$evmone_archive = "$Env:HOME\evmone.zip"
32+
33+
Invoke-WebRequest -URI "$evmone_url" -OutFile "$evmone_archive"
34+
Expand-Archive "$evmone_archive" -DestinationPath evmone

0 commit comments

Comments
 (0)