Skip to content

Commit 88cd39c

Browse files
tomasoltomasol
authored
Merge pull request #91 from obeli-sk/sync-flake-lock-20260330-110600
Sync `flake.lock` from upstream
2 parents 31c8737 + c95949c commit 88cd39c

32 files changed

Lines changed: 560 additions & 370 deletions

File tree

‎.github/workflows/check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
run: |
103103
nix develop --command echo
104104
105-
- run: nix develop --command obelisk generate wit-deps -c obelisk-external.toml wit/deps --overwrite
105+
- run: nix develop --command obelisk generate wit-deps --deployment obelisk-external.toml wit/deps --overwrite
106106

107107
- run: cat dev-deps.txt
108108

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
/fly.toml
55
/scripts/json-app-init-mailing-list.sh
66
/obelisk.log
7+
target-sandbox

‎.ignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.direnv/
22
/target/
3+
target-sandbox

‎Justfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ test-integration:
1212
(cd activity/obelisk-&& TEST_ENDPOINT_URL=http://localhost:5005 cargo nextest run -- --ignored)
1313

1414
verify *params:
15-
obelisk server verify --config obelisk-local.toml {{params}}
16-
obelisk server verify --config obelisk-local-postgres.toml {{params}}
17-
obelisk server verify --config obelisk-oci.toml {{params}}
15+
obelisk server verify --server-config server.toml --deployment obelisk-local.toml {{params}}
16+
obelisk server verify --server-config server-postgres.toml --deployment obelisk-local-postgres.toml {{params}}
17+
obelisk server verify --server-config server.toml --deployment obelisk-oci.toml {{params}}
1818

1919
serve:
20-
obelisk server run --config ${CONFIG:-obelisk-local.toml}
20+
obelisk server run --server-config server.toml --deployment ${CONFIG:-obelisk-local.toml}
2121

2222
serve-oci:
23-
obelisk server run --config ${CONFIG:-obelisk-oci.toml}
23+
obelisk server run --server-config server.toml --deployment ${CONFIG:-obelisk-oci.toml}
2424

2525
app-init params:
2626
obelisk execution submit -f .../workflow.app-init '{{params}}'

‎dev-deps.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
cargo-edit-upgrade 0.13.8
2-
cargo-expand 1.0.119
1+
cargo-edit-upgrade 0.13.9
2+
cargo-expand 1.0.121
33
cargo generate 0.23.7
4-
cargo-insta 1.45.1
5-
cargo-nextest 0.9.124
6-
just 1.46.0
7-
obelisk 0.35.4
4+
cargo-insta 1.46.3
5+
cargo-nextest 0.9.132
6+
just 1.47.1
7+
obelisk 0.36.1
88
pkg-config 0.29.2
9-
rustc 1.93.0 (254b59607 2026-01-19)
10-
wasm-tools 1.244.0
9+
rustc 1.94.0 (4a4ef493e 2026-03-02)
10+
wasm-tools 1.245.1
1111
ldd (GNU libc) 2.42

‎flake.lock‎

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

‎obelisk-external.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[[activity_wasm]]
22
name = "activity_fly_http"
3-
location = "oci://docker.io/getobelisk/components_fly_activity_fly_http:2026-01-13-1@sha256:7b39b252793821b0b7a1cfb4c330fa41c869a8895cfd0ee69c9a9b7e2d3d1b9d"
3+
location = "oci://docker.io/getobelisk/components_fly_activity_fly_http:2026-03-30@sha256:fef07531120e10a8e59edbb4927dcfffae68aed6925d76ea43c8e02e30584161"
44

55
# HTTP Client for health checking.
66
[[activity_wasm]]
77
name = "activity_http_generic"
8-
location = "oci://docker.io/getobelisk/components_http_activity_http_generic:2026-01-13@sha256:f64b64aa176224645a21d583312ad1e832afae57af138998711771c4411e3b3e"
8+
location = "oci://docker.io/getobelisk/components_http_activity_http_generic:2026-03-30@sha256:d170092f3023380960c459bb92d71b6a0ac8c8d3f16ccb863eed72e69cf7157d"
99

1010
[[activity_wasm]]
1111
name = "activity_obelisk_client"
12-
location = "oci://docker.io/getobelisk/components_obelisk_activity_obelisk_client_http:2026-01-10@sha256:ca99fa1f0b08d1883784baff2966e07abe36b450b63d8deac25f8abf8cecd0ce"
12+
location = "oci://docker.io/getobelisk/components_obelisk_activity_obelisk_client_http:2026-03-30@sha256:f5fa282bb6941b3520c9ac98a949f0c1438eb3f728369858165bba4a91a8dd4c"

‎obelisk-local-postgres.toml‎

Lines changed: 21 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,36 @@
1-
api.listening_addr = "127.0.0.1:5005"
2-
webui.listening_addr = "127.0.0.1:8080"
3-
4-
database.postgres.host = "${POSTGRES_HOST}"
5-
database.postgres.user = "${POSTGRES_USER}"
6-
database.postgres.password = "${POSTGRES_PASSWORD}"
7-
database.postgres.db_name = "${POSTGRES_DATABASE}"
8-
database.postgres.provision_policy = "auto"
9-
10-
[log.file]
11-
enabled = true
12-
target = true
13-
level="info"
14-
directory = "."
15-
prefix = "obelisk.log" # File name prefix
16-
171
[[activity_wasm]]
182
name = "activity_fly_http"
19-
location = "oci://docker.io/getobelisk/components_fly_activity_fly_http:2026-01-13-1@sha256:7b39b252793821b0b7a1cfb4c330fa41c869a8895cfd0ee69c9a9b7e2d3d1b9d"
20-
exec.lock_expiry.seconds = 30
21-
env_vars = ["FLY_API_TOKEN"]
3+
location = "oci://docker.io/getobelisk/components_fly_activity_fly_http:2026-03-30@sha256:fef07531120e10a8e59edbb4927dcfffae68aed6925d76ea43c8e02e30584161"
4+
exec.lock_expiry.seconds = 15
225
max_retries = 6
6+
[[activity_wasm.allowed_host]]
7+
pattern = "https://api.machines.dev"
8+
methods = ["POST"]
9+
[activity_wasm.allowed_host.secrets]
10+
env_vars = ["FLY_API_TOKEN"]
11+
replace_in = ["headers"]
2312

2413
# HTTP Client for health checking.
2514
[[activity_wasm]]
2615
name = "activity_http_generic"
27-
location = "oci://docker.io/getobelisk/components_http_activity_http_generic:2026-01-13@sha256:f64b64aa176224645a21d583312ad1e832afae57af138998711771c4411e3b3e"
16+
location = "oci://docker.io/getobelisk/components_http_activity_http_generic:2026-03-30@sha256:d170092f3023380960c459bb92d71b6a0ac8c8d3f16ccb863eed72e69cf7157d"
2817
exec.lock_expiry.seconds = 5
18+
[[activity_wasm.allowed_host]]
19+
pattern = "https://*.fly.dev"
20+
methods = "*"
2921

3022
[[activity_wasm]]
3123
name = "activity_obelisk_client"
32-
location = "oci://docker.io/getobelisk/components_obelisk_activity_obelisk_client_http:2026-01-10@sha256:ca99fa1f0b08d1883784baff2966e07abe36b450b63d8deac25f8abf8cecd0ce"
24+
location = "oci://docker.io/getobelisk/components_obelisk_activity_obelisk_client_http:2026-03-30@sha256:f5fa282bb6941b3520c9ac98a949f0c1438eb3f728369858165bba4a91a8dd4c"
25+
[[activity_wasm.allowed_host]]
26+
pattern = "https://*.fly.dev"
27+
methods = ["GET", "POST"]
3328

34-
[[workflow]]
29+
[[workflow_wasm]]
3530
name = "obelisk_deployer_flyio"
36-
location = "${OBELISK_TOML_DIR}/target/wasm32-unknown-unknown/release_workflow/obelisk_deployer_flyio.wasm"
31+
location = "${DEPLOYMENT_DIR}/target/wasm32-unknown-unknown/release_workflow/obelisk_deployer_flyio.wasm"
3732
backtrace.sources = {
38-
".../src/lib.rs" = "${OBELISK_TOML_DIR}/workflow/deployer-workflow/src/lib.rs",
39-
".../src/testing.rs" = "${OBELISK_TOML_DIR}/workflow/deployer-workflow/src/testing.rs",
40-
".../src/toml.rs" = "${OBELISK_TOML_DIR}/workflow/deployer-workflow/src/toml.rs",
33+
".../src/lib.rs" = "${DEPLOYMENT_DIR}/workflow/deployer-workflow/src/lib.rs",
34+
".../src/testing.rs" = "${DEPLOYMENT_DIR}/workflow/deployer-workflow/src/testing.rs",
35+
".../src/toml.rs" = "${DEPLOYMENT_DIR}/workflow/deployer-workflow/src/toml.rs",
4136
}
42-
backtrace.ignore_component_digest = true
43-
44-
[[http_server]]
45-
name = "webhook_server"
46-
listening_addr = "0.0.0.0:9090"

‎obelisk-local.toml‎

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,36 @@
1-
api.listening_addr = "127.0.0.1:5005"
2-
webui.listening_addr = "127.0.0.1:8080"
3-
4-
5-
[log.file]
6-
enabled = true
7-
target = true
8-
level="info"
9-
directory = "."
10-
prefix = "obelisk.log" # File name prefix
11-
121
[[activity_wasm]]
132
name = "activity_fly_http"
14-
location = "oci://docker.io/getobelisk/components_fly_activity_fly_http:2026-01-13-1@sha256:7b39b252793821b0b7a1cfb4c330fa41c869a8895cfd0ee69c9a9b7e2d3d1b9d"
15-
exec.lock_expiry.seconds = 30
16-
env_vars = ["FLY_API_TOKEN"]
3+
location = "oci://docker.io/getobelisk/components_fly_activity_fly_http:2026-03-30@sha256:fef07531120e10a8e59edbb4927dcfffae68aed6925d76ea43c8e02e30584161"
4+
exec.lock_expiry.seconds = 15
175
max_retries = 6
6+
[[activity_wasm.allowed_host]]
7+
pattern = "https://api.machines.dev"
8+
methods = ["POST"]
9+
[activity_wasm.allowed_host.secrets]
10+
env_vars = ["FLY_API_TOKEN"]
11+
replace_in = ["headers"]
1812

1913
# HTTP Client for health checking.
2014
[[activity_wasm]]
2115
name = "activity_http_generic"
22-
location = "oci://docker.io/getobelisk/components_http_activity_http_generic:2026-01-13@sha256:f64b64aa176224645a21d583312ad1e832afae57af138998711771c4411e3b3e"
16+
location = "oci://docker.io/getobelisk/components_http_activity_http_generic:2026-03-30@sha256:d170092f3023380960c459bb92d71b6a0ac8c8d3f16ccb863eed72e69cf7157d"
2317
exec.lock_expiry.seconds = 5
18+
[[activity_wasm.allowed_host]]
19+
pattern = "https://*.fly.dev"
20+
methods = "*"
2421

2522
[[activity_wasm]]
2623
name = "activity_obelisk_client"
27-
location = "oci://docker.io/getobelisk/components_obelisk_activity_obelisk_client_http:2026-01-10@sha256:ca99fa1f0b08d1883784baff2966e07abe36b450b63d8deac25f8abf8cecd0ce"
24+
location = "oci://docker.io/getobelisk/components_obelisk_activity_obelisk_client_http:2026-03-30@sha256:f5fa282bb6941b3520c9ac98a949f0c1438eb3f728369858165bba4a91a8dd4c"
25+
[[activity_wasm.allowed_host]]
26+
pattern = "https://*.fly.dev"
27+
methods = ["GET", "POST"]
2828

29-
[[workflow]]
29+
[[workflow_wasm]]
3030
name = "obelisk_deployer_flyio"
31-
location = "${OBELISK_TOML_DIR}/target/wasm32-unknown-unknown/release_workflow/obelisk_deployer_flyio.wasm"
31+
location = "${DEPLOYMENT_DIR}/target/wasm32-unknown-unknown/release_workflow/obelisk_deployer_flyio.wasm"
3232
backtrace.sources = {
33-
".../src/lib.rs" = "${OBELISK_TOML_DIR}/workflow/deployer-workflow/src/lib.rs",
34-
".../src/testing.rs" = "${OBELISK_TOML_DIR}/workflow/deployer-workflow/src/testing.rs",
35-
".../src/toml.rs" = "${OBELISK_TOML_DIR}/workflow/deployer-workflow/src/toml.rs",
33+
".../src/lib.rs" = "${DEPLOYMENT_DIR}/workflow/deployer-workflow/src/lib.rs",
34+
".../src/testing.rs" = "${DEPLOYMENT_DIR}/workflow/deployer-workflow/src/testing.rs",
35+
".../src/toml.rs" = "${DEPLOYMENT_DIR}/workflow/deployer-workflow/src/toml.rs",
3636
}
37-
backtrace.ignore_component_digest = true
38-
39-
[[http_server]]
40-
name = "webhook_server"
41-
listening_addr = "0.0.0.0:9090"

‎obelisk-oci.toml‎

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,37 @@
1-
api.listening_addr = "127.0.0.1:5005"
2-
webui.listening_addr = "127.0.0.1:8080"
3-
4-
5-
[log.file]
6-
enabled = true
7-
target = true
8-
level="info"
9-
directory = "."
10-
prefix = "obelisk.log" # File name prefix
11-
121
[[activity_wasm]]
132
name = "activity_fly_http"
14-
location = "oci://docker.io/getobelisk/components_fly_activity_fly_http:2026-01-13-1@sha256:7b39b252793821b0b7a1cfb4c330fa41c869a8895cfd0ee69c9a9b7e2d3d1b9d"
15-
exec.lock_expiry.seconds = 30
16-
env_vars = ["FLY_API_TOKEN"]
3+
location = "oci://docker.io/getobelisk/components_fly_activity_fly_http:2026-03-30@sha256:fef07531120e10a8e59edbb4927dcfffae68aed6925d76ea43c8e02e30584161"
4+
exec.lock_expiry.seconds = 15
175
max_retries = 6
6+
[[activity_wasm.allowed_host]]
7+
pattern = "https://api.machines.dev"
8+
methods = ["POST"]
9+
[activity_wasm.allowed_host.secrets]
10+
env_vars = ["FLY_API_TOKEN"]
11+
replace_in = ["headers"]
1812

1913
# HTTP Client for health checking.
2014
[[activity_wasm]]
2115
name = "activity_http_generic"
22-
location = "oci://docker.io/getobelisk/components_http_activity_http_generic:2026-01-13@sha256:f64b64aa176224645a21d583312ad1e832afae57af138998711771c4411e3b3e"
16+
location = "oci://docker.io/getobelisk/components_http_activity_http_generic:2026-03-30@sha256:d170092f3023380960c459bb92d71b6a0ac8c8d3f16ccb863eed72e69cf7157d"
2317
exec.lock_expiry.seconds = 5
18+
[[activity_wasm.allowed_host]]
19+
pattern = "https://*.fly.dev"
20+
methods = "*"
2421

2522
[[activity_wasm]]
2623
name = "activity_obelisk_client"
27-
location = "oci://docker.io/getobelisk/components_obelisk_activity_obelisk_client_http:2026-01-10@sha256:ca99fa1f0b08d1883784baff2966e07abe36b450b63d8deac25f8abf8cecd0ce"
24+
location = "oci://docker.io/getobelisk/components_obelisk_activity_obelisk_client_http:2026-03-30@sha256:f5fa282bb6941b3520c9ac98a949f0c1438eb3f728369858165bba4a91a8dd4c"
25+
[[activity_wasm.allowed_host]]
26+
pattern = "https://*.fly.dev"
27+
methods = ["GET", "POST"]
2828

29-
[[workflow]]
29+
[[workflow_wasm]]
3030
name = "obelisk_deployer_flyio"
31-
location = "oci://docker.io/getobelisk/components_flyio_obelisk_deployer_flyio:2026-02-12@sha256:6376d4491f1033f4170bf01fd3cf07e4d3444a5ba780050a3656afed8312f310"
32-
backtrace.sources = {
33-
".../src/lib.rs" = "${OBELISK_TOML_DIR}/workflow/deployer-workflow/src/lib.rs",
34-
".../src/testing.rs" = "${OBELISK_TOML_DIR}/workflow/deployer-workflow/src/testing.rs",
35-
".../src/toml.rs" = "${OBELISK_TOML_DIR}/workflow/deployer-workflow/src/toml.rs",
36-
}
31+
location = "oci://docker.io/getobelisk/components_flyio_obelisk_deployer_flyio:2026-03-30@sha256:07b5f2492a3f41a36fbe74cda801a7a0c291a986f99d0c1d0866c43bf89d7aa2"
3732

3833
# This webhook is here only for `push-components.sh`
39-
[[webhook_endpoint]]
34+
[[webhook_endpoint_wasm]]
4035
name = "webhook_healthcheck"
41-
location = "oci://docker.io/getobelisk/components_flyio_webhook_healthcheck:2026-02-12@sha256:a86461ea58e59f375b938b63441605fa2f5eb00bfbe71ef97c47aee657294dc3"
42-
http_server = "webhook_server"
36+
location = "oci://docker.io/getobelisk/components_flyio_webhook_healthcheck:2026-03-30@sha256:a81199c7df4d282725ed57f0d20f4214a64dc04aa8320911cda1748dcfde68f8"
4337
routes = ["/obeliskhealthcheck"]
44-
45-
[[http_server]]
46-
name = "webhook_server"
47-
listening_addr = "0.0.0.0:9090"

0 commit comments

Comments
 (0)