Skip to content

Commit 6f0f5b1

Browse files
author
filip mertens
committed
Merge branch 'nx' of https://github.com/ethereum/remix-project into nx
2 parents 95ddee8 + 5d8e44f commit 6f0f5b1

File tree

2 files changed

+36
-22
lines changed

2 files changed

+36
-22
lines changed

.circleci/config.yml

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ parameters:
55
type: boolean
66
default: false
77
orbs:
8-
browser-tools: circleci/[email protected].0
8+
browser-tools: circleci/[email protected].1
99
jobs:
1010
build:
1111
docker:
@@ -24,7 +24,7 @@ jobs:
2424
key: v1-deps-{{ checksum "yarn.lock" }}
2525
paths:
2626
- node_modules
27-
- run: NX_BIN_URL=http://127.0.0.1:8080/assets/js NX_WASM_URL=http://127.0.0.1:8080/assets/js yarn build:production
27+
- run: NX_BIN_URL=http://127.0.0.1:8080/assets/js NX_WASM_URL=http://127.0.0.1:8080/assets/js yarn build
2828
- run: yarn nx build remix-ide-e2e-src-local-plugin & yarn run build:libs
2929
- run: yarn nx run debugger:build:production
3030
- run: yarn nx run solidity-compiler:build:production
@@ -74,7 +74,7 @@ jobs:
7474
- run: cd dist/libs/remix-tests && yarn add @remix-project/remix-simulator ../../libs/remix-simulator
7575
- run: cd dist/libs/remix-tests && ./bin/remix-tests ./../../../libs/remix-tests/tests/examples_0/assert_ok_test.sol
7676
- run: node dist/libs/remix-tests/bin/remix-tests ./libs/remix-tests/tests/examples_0/assert_ok_test.sol
77-
- run: yarn run test:libs
77+
- run: yarn run test:libs
7878

7979
remix-ide-browser:
8080
docker:
@@ -93,14 +93,29 @@ jobs:
9393
type: string
9494
parallelism: 10
9595
steps:
96-
- browser-tools/install-browser-tools
97-
- run:
98-
command: |
99-
google-chrome --version
100-
firefox --version
101-
geckodriver --version
102-
chromedriver --version
103-
rm LICENSE.chromedriver 2> /dev/null
96+
- when:
97+
condition:
98+
equal: [ "chrome", << parameters.browser >> ]
99+
steps:
100+
- browser-tools/install-browser-tools:
101+
install-firefox: false
102+
install-chrome: true
103+
install-geckodriver: false
104+
install-chromedriver: true
105+
- run: google-chrome --version
106+
- run: chromedriver --version
107+
- run: rm LICENSE.chromedriver 2> /dev/null
108+
- when:
109+
condition:
110+
equal: [ "firefox", << parameters.browser >> ]
111+
steps:
112+
- browser-tools/install-browser-tools:
113+
install-firefox: true
114+
install-chrome: false
115+
install-geckodriver: true
116+
install-chromedriver: false
117+
- run: firefox --version
118+
- run: geckodriver --version
104119
- checkout
105120
- attach_workspace:
106121
at: .
@@ -140,15 +155,14 @@ jobs:
140155
type: string
141156
parallelism: 4
142157
steps:
143-
- browser-tools/install-browser-tools
144-
- run:
145-
command: |
146-
google-chrome --version
147-
firefox --version
148-
geckodriver --version
149-
chromedriver --version
150-
rm LICENSE.chromedriver 2> /dev/null
151-
name: Check install
158+
- browser-tools/install-browser-tools:
159+
install-firefox: false
160+
install-chrome: true
161+
install-geckodriver: false
162+
install-chromedriver: true
163+
- run: google-chrome --version
164+
- run: chromedriver --version
165+
- run: rm LICENSE.chromedriver 2> /dev/null
152166
- checkout
153167
- attach_workspace:
154168
at: .
@@ -316,4 +330,4 @@ workflows:
316330
branches:
317331
only: remix_beta
318332

319-
# VS Code Extension Version: 1.5.1
333+
# VS Code Extension Version: 1.5.1

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "remix-project",
3-
"version": "0.30.0-dev",
3+
"version": "0.30.0",
44
"license": "MIT",
55
"description": "Ethereum Remix Monorepo",
66
"keywords": [

0 commit comments

Comments
 (0)