Skip to content

Commit e076930

Browse files
authored
Merge pull request #106 from hippocampusSwapper/feature/hip-enableDLCCircleCi
Enable DLC in CircleCI configuration
2 parents 41a3cd0 + 3ee833e commit e076930

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

.circleci/config.yml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@ version: 2
22
jobs:
33
ethtest:
44
machine:
5-
image: ubuntu-1604:202007-01
5+
image: ubuntu-2004:202201-02
6+
docker_layer_caching: true
67
environment:
78
NETWORK: regtest
89
PORT: 80
910
SSL_PORT: 443
1011
NGINX_CONFIG_PATH: ../../nginx/nginx.conf
1112
CERT_PATH: /etc/ssl/certs
1213
BLOCKCHAIN_PATH: ./blockchain/
14+
COMPOSE_DOCKER_CLI_BUILD: 0
15+
DOCKER_BUILDKIT: 0
1316
steps:
1417
- checkout
1518
- run:
@@ -27,7 +30,7 @@ jobs:
2730
- run:
2831
name: Deploy ETH regtest nodes
2932
command: |
30-
docker-compose -f Connector/tests/docker-compose/eth.yml -p eth_regtest_api up --build -d
33+
docker-compose -f Connector/tests/docker-compose/eth.yml -p eth_regtest_api up -d
3134
- run:
3235
name: Add ethereumgo to /etc/hosts
3336
command: |
@@ -42,17 +45,19 @@ jobs:
4245
command: |
4346
source venv/bin/activate
4447
cd Connector && python -m pytest -c tests/eth/pytest_eth.ini -s --cov=eth/ tests/eth
45-
4648
btctest:
4749
machine:
48-
image: ubuntu-1604:202007-01
50+
image: ubuntu-2004:202201-02
51+
docker_layer_caching: true
4952
environment:
5053
NETWORK: regtest
5154
PORT: 80
5255
SSL_PORT: 443
5356
NGINX_CONFIG_PATH: ../../nginx/nginx.conf
5457
CERT_PATH: /etc/ssl/certs
55-
BLOCKCHAIN_PATH: ./blockchain/
58+
BLOCKCHAIN_PATH: ./blockchain/
59+
COMPOSE_DOCKER_CLI_BUILD: 0
60+
DOCKER_BUILDKIT: 0
5661
steps:
5762
- checkout
5863
- run:
@@ -68,9 +73,14 @@ jobs:
6873
source venv/bin/activate
6974
flake8 --statistics
7075
- run:
71-
name: Deploy BTC regtest nodes
76+
name: Build docker compose images
77+
command: |
78+
docker-compose -f Connector/tests/docker-compose/btc.yml -p btc_regtest_api build --no-rm
79+
no_output_timeout: 1h
80+
- run:
81+
name: Deploy BTC regtest node
7282
command: |
73-
docker-compose -f Connector/tests/docker-compose/btc.yml -p btc_regtest_api up --build -d
83+
docker-compose -f Connector/tests/docker-compose/btc.yml -p btc_regtest_api up -d
7484
- run:
7585
name: Add electrum and bitcoincore to /etc/hosts
7686
command: |

0 commit comments

Comments
 (0)