Skip to content

Commit 63c516e

Browse files
authored
Merge branch 'main' into feat/increase_difficulty
2 parents 827c310 + d7b6b16 commit 63c516e

22 files changed

+378
-106
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
BODY=$(gh release view ${{ needs.release.outputs.tag_name }} --json body | jq -r '.body')
108108
EXTENSION=$(cat .github/releases/release_notes.md)
109109
110-
# Build up notes from BODY and EXTENSION seperated by two newlines
110+
# Build up notes from BODY and EXTENSION separated by two newlines
111111
# https://trstringer.com/github-actions-multiline-strings/#option-2---environment-variable
112112
NOTES=$(cat << EOF
113113
$BODY

.github/workflows/test.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Tests
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
8+
jobs:
9+
run-integration-tests:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
14+
- name: Install Doppler CLI
15+
uses: dopplerhq/cli-action@v1
16+
17+
- name: Install golang
18+
uses: actions/setup-go@v5
19+
20+
- name: Install node
21+
uses: actions/setup-node@v4
22+
23+
- name: Build Docker Images
24+
run: docker compose -f docker/docker-compose.dev.yml build
25+
26+
- name: Initialize chain
27+
env:
28+
ADMIN_ADDRESS: ${{ secrets.INTEGRATION_TEST_ADMIN_ADDRESS }}
29+
run: |
30+
./stack chain-clean
31+
docker compose -f ./docker/docker-compose.dev.yml up chain -d
32+
./stack chain-boot
33+
34+
- name: Run stack
35+
env:
36+
ADMIN_ADDRESS: ${{ secrets.INTEGRATION_TEST_ADMIN_ADDRESS }}
37+
DOPPLER_TOKEN_JOB_CREATOR: ${{ secrets.INTEGRATION_TEST_DOPPLER_TOKEN_JOB_CREATOR }}
38+
DOPPLER_TOKEN_SOLVER: ${{ secrets.INTEGRATION_TEST_DOPPLER_TOKEN_SOLVER }}
39+
WEB3_PRIVATE_KEY: ${{ secrets.INTEGRATION_TEST_WEB3_PRIVATE_KEY }}
40+
run: docker compose -f ./docker/docker-compose.dev.yml up -d
41+
42+
- name: Run tests
43+
env:
44+
DOPPLER_TOKEN: ${{ secrets.INTEGRATION_TESTS_DOPPLER_TOKEN }}
45+
run: ./stack integration-tests

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
hardhat/node_modules
2+
hardhat/.openzeppelin
23
hardhat/artifacts
34
hardhat/cache
45
hardhat/deployments/dev

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "2.2.7"
2+
".": "2.2.8"
33
}

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## [2.2.8](https://github.com/Lilypad-Tech/lilypad/compare/v2.2.7...v2.2.8) (2024-08-16)
4+
5+
6+
### Bug Fixes
7+
8+
* Remove ntfs zone files ([#286](https://github.com/Lilypad-Tech/lilypad/issues/286)) ([6b7b2dc](https://github.com/Lilypad-Tech/lilypad/commit/6b7b2dcc3c0e94607e20ee2646d78513ff907cfc))
9+
310
## [2.2.7](https://github.com/Lilypad-Tech/lilypad/compare/v2.2.6...v2.2.7) (2024-08-07)
411

512

docker/docker-compose.dev.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: lilypad
22
services:
33
chain:
4-
image: offchainlabs/nitro-node:v2.3.4-b4cc111
4+
image: offchainlabs/nitro-node:v3.1.1-beta.2-6073359
55
container_name: chain
66
ports:
77
- 8547:8547
@@ -30,9 +30,9 @@ services:
3030
"0.0.0.0",
3131
]
3232
volumes:
33-
- ../data/chain:/home/user/.arbitrum
33+
- chain-data:/home/user/.arbitrum
3434
healthcheck:
35-
test: ["CMD", "curl", "-f", "http://localhost:8548/"]
35+
test: ["CMD", "curl", "-f", "http://localhost:8547/"]
3636
interval: 30s
3737
timeout: 10s
3838
retries: 5
@@ -89,9 +89,12 @@ services:
8989
extra_hosts:
9090
- "localhost:host-gateway"
9191
volumes:
92-
- ../data/bacalhau:/tmp/lilypad/data
92+
- bacalhau-data:/tmp/lilypad/data
9393
- /var/run/docker.sock:/var/run/docker.sock
9494
environment:
9595
- WEB3_PRIVATE_KEY
9696
- BACALHAU_SERVE_IPFS_PATH=/tmp/lilypad/data/ipfs
9797
- LOG_LEVEL=debug
98+
volumes:
99+
chain-data:
100+
bacalhau-data:

0 commit comments

Comments
 (0)