Skip to content

Commit 381d2f1

Browse files
JannikStJannikSt
authored
release v.0.2.6 (#290)
* add check if pool is active (#287) * move code into crates (#288)
2 parents 219951e + f3a1f42 commit 381d2f1

File tree

172 files changed

+69
-23
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+69
-23
lines changed

‎.github/workflows/dev-release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159
uses: docker/build-push-action@v4
160160
with:
161161
context: .
162-
file: ./discovery/Dockerfile
162+
file: ./crates/discovery/Dockerfile
163163
push: true
164164
tags: |
165165
ghcr.io/${{ steps.meta.outputs.repo_lower }}/discovery:dev
@@ -171,7 +171,7 @@ jobs:
171171
uses: docker/build-push-action@v4
172172
with:
173173
context: .
174-
file: ./validator/Dockerfile
174+
file: ./crates/validator/Dockerfile
175175
push: true
176176
tags: |
177177
ghcr.io/${{ steps.meta.outputs.repo_lower }}/validator:dev
@@ -183,7 +183,7 @@ jobs:
183183
uses: docker/build-push-action@v4
184184
with:
185185
context: .
186-
file: ./orchestrator/Dockerfile
186+
file: ./crates/orchestrator/Dockerfile
187187
push: true
188188
tags: |
189189
ghcr.io/${{ steps.meta.outputs.repo_lower }}/orchestrator:dev

‎.github/workflows/prod-release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ jobs:
157157
uses: docker/build-push-action@v4
158158
with:
159159
context: .
160-
file: ./discovery/Dockerfile
160+
file: ./crates/discovery/Dockerfile
161161
push: true
162162
tags: |
163163
ghcr.io/${{ steps.meta.outputs.repo_lower }}/discovery:latest
@@ -170,7 +170,7 @@ jobs:
170170
uses: docker/build-push-action@v4
171171
with:
172172
context: .
173-
file: ./validator/Dockerfile
173+
file: ./crates/validator/Dockerfile
174174
push: true
175175
tags: |
176176
ghcr.io/${{ steps.meta.outputs.repo_lower }}/validator:latest
@@ -183,7 +183,7 @@ jobs:
183183
uses: docker/build-push-action@v4
184184
with:
185185
context: .
186-
file: ./orchestrator/Dockerfile
186+
file: ./crates/orchestrator/Dockerfile
187187
push: true
188188
tags: |
189189
ghcr.io/${{ steps.meta.outputs.repo_lower }}/orchestrator:latest

‎Cargo.lock‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
[workspace]
22
members = [
3-
"discovery",
4-
"worker",
5-
"validator",
6-
"shared",
7-
"orchestrator",
8-
"dev-utils",
3+
"crates/discovery",
4+
"crates/worker",
5+
"crates/validator",
6+
"crates/shared",
7+
"crates/orchestrator",
8+
"crates/dev-utils",
99
]
1010
resolver = "2"
1111

1212
[workspace.dependencies]
13-
shared = { path = "shared" }
13+
shared = { path = "crates/shared" }
1414
actix-web = "4.9.0"
1515
clap = { version = "4.5.27", features = ["derive"] }
1616
serde = { version = "1.0.219", features = ["derive"] }
@@ -35,7 +35,7 @@ redis = "0.28.1"
3535
redis-test = "0.8.0"
3636

3737
[workspace.package]
38-
version = "0.2.5"
38+
version = "0.2.6"
3939
edition = "2021"
4040

4141
[workspace.features]

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,22 +68,22 @@ whitelist-provider:
6868

6969
watch-discovery:
7070
set -a; source .env; set +a; \
71-
cargo watch -w discovery/src -x "run --bin discovery -- --rpc-url $${RPC_URL}"
71+
cargo watch -w crates/discovery/src -x "run --bin discovery -- --rpc-url $${RPC_URL}"
7272

7373
watch-worker:
7474
set -a; source ${ENV_FILE}; set +a; \
75-
cargo watch -w worker/src -x "run --bin worker -- run --port 8091 --external-ip $${WORKER_EXTERNAL_IP:-localhost} --compute-pool-id $$WORKER_COMPUTE_POOL_ID --skip-system-checks $${LOKI_URL:+--loki-url $${LOKI_URL}} --log-level $${LOG_LEVEL:-info}"
75+
cargo watch -w crates/worker/src -x "run --bin worker -- run --port 8091 --external-ip $${WORKER_EXTERNAL_IP:-localhost} --compute-pool-id $$WORKER_COMPUTE_POOL_ID --skip-system-checks $${LOKI_URL:+--loki-url $${LOKI_URL}} --log-level $${LOG_LEVEL:-info}"
7676

7777
watch-check:
78-
cargo watch -w worker/src -x "run --bin worker -- check"
78+
cargo watch -w crates/worker/src -x "run --bin worker -- check"
7979

8080
watch-validator:
8181
set -a; source ${ENV_FILE}; set +a; \
82-
cargo watch -w validator/src -x "run --bin validator -- --validator-key $${PRIVATE_KEY_VALIDATOR} --rpc-url $${RPC_URL} --pool-id $${WORKER_COMPUTE_POOL_ID} --toploc-server-url $${TOPLOC_SERVER_URL} --toploc-auth-token $${TOPLOC_AUTH_TOKEN} --s3-credentials $${S3_CREDENTIALS} --bucket-name $${BUCKET_NAME} -l $${LOG_LEVEL:-info} --toploc-grace-interval $${TOPLOC_GRACE_INTERVAL:-30}"
82+
cargo watch -w crates/validator/src -x "run --bin validator -- --validator-key $${PRIVATE_KEY_VALIDATOR} --rpc-url $${RPC_URL} --pool-id $${WORKER_COMPUTE_POOL_ID} --toploc-server-url $${TOPLOC_SERVER_URL} --toploc-auth-token $${TOPLOC_AUTH_TOKEN} --s3-credentials $${S3_CREDENTIALS} --bucket-name $${BUCKET_NAME} -l $${LOG_LEVEL:-info} --toploc-grace-interval $${TOPLOC_GRACE_INTERVAL:-30}"
8383

8484
watch-orchestrator:
8585
set -a; source ${ENV_FILE}; set +a; \
86-
cargo watch -w orchestrator/src -x "run --bin orchestrator -- -r $$RPC_URL -k $$POOL_OWNER_PRIVATE_KEY -d 0 -p 8090 -i 10 -u http://localhost:8090 --s3-credentials $$S3_CREDENTIALS --compute-pool-id $$WORKER_COMPUTE_POOL_ID --bucket-name $$BUCKET_NAME -l $${LOG_LEVEL:-info} --hourly-s3-upload-limit $${HOURLY_S3_LIMIT:-3}"
86+
cargo watch -w crates/orchestrator/src -x "run --bin orchestrator -- -r $$RPC_URL -k $$POOL_OWNER_PRIVATE_KEY -d 0 -p 8090 -i 10 -u http://localhost:8090 --s3-credentials $$S3_CREDENTIALS --compute-pool-id $$WORKER_COMPUTE_POOL_ID --bucket-name $$BUCKET_NAME -l $${LOG_LEVEL:-info} --hourly-s3-upload-limit $${HOURLY_S3_LIMIT:-3}"
8787

8888
build-worker:
8989
cargo build --release --bin worker

dev-utils/Cargo.toml renamed to crates/dev-utils/Cargo.toml

File renamed without changes.

dev-utils/examples/compute_pool.rs renamed to crates/dev-utils/examples/compute_pool.rs

File renamed without changes.

dev-utils/examples/create_domain.rs renamed to crates/dev-utils/examples/create_domain.rs

File renamed without changes.

dev-utils/examples/eject_node.rs renamed to crates/dev-utils/examples/eject_node.rs

File renamed without changes.

dev-utils/examples/get_node_info.rs renamed to crates/dev-utils/examples/get_node_info.rs

File renamed without changes.

0 commit comments

Comments
 (0)