Skip to content

Commit c5a6fd5

Browse files
committed
fix: tilt deps
1 parent b7e5897 commit c5a6fd5

File tree

2 files changed

+52
-24
lines changed

2 files changed

+52
-24
lines changed

.github/workflows/e2e-ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
echo $! > /tmp/pids/sim_record.pid
130130
131131
# Run the E2E tests
132-
nix develop -c tilt ci ios-e2e-tests -f ./dev/Tiltfile
132+
nix develop -c tilt -f ./dev/Tiltfile ci -- --test ios-e2e-tests
133133
134134
- name: Cleanup Processes
135135
if: always()

dev/Tiltfile

Lines changed: 51 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
config.define_string_list("test")
2+
cfg = config.parse()
3+
14
local_resource(
25
name="init-onchain",
36
labels = ["dev-setup"],
@@ -9,18 +12,18 @@ local_resource(
912
)
1013

1114
local_resource(
12-
name='init-lightning',
13-
labels = ['dev-setup'],
14-
cmd='vendor/galoy-quickstart/bin/init-lightning.sh',
15+
name="init-lightning",
16+
labels = ["dev-setup"],
17+
cmd="vendor/galoy-quickstart/bin/init-lightning.sh",
1518
resource_deps = [
1619
"init-onchain",
1720
"lnd1",
1821
"lnd-outside-1",
1922
]
2023
)
2124

22-
docker_compose('vendor/galoy-quickstart/docker-compose.yml')
23-
galoy_services = ["apollo-router", "galoy", "trigger", "redis", "mongodb", "mongodb-migrate", "price", "price-history", "price-history-migrate", "price-history-pg", "svix", "svix-pg", "stablesats", "notifications", "notifications-pg"]
25+
docker_compose("vendor/galoy-quickstart/docker-compose.yml")
26+
galoy_services = ["apollo-router", "redis", "mongodb", "mongodb-migrate", "price", "price-history", "price-history-migrate", "price-history-pg", "svix", "svix-pg", "stablesats", "notifications", "notifications-pg"]
2427
auth_services = ["oathkeeper", "kratos", "kratos-pg", "hydra", "hydra-pg", "hydra-migrate"]
2528
bitcoin_services = ["bitcoind", "bitcoind-signer", "lnd1", "lnd-outside-1", "bria", "bria-pg", "fulcrum"]
2629

@@ -31,45 +34,70 @@ for service in auth_services:
3134
for service in bitcoin_services:
3235
dc_resource(service, labels = ["bitcoin"])
3336

34-
dc_resource('otel-agent', labels = ["otel"])
35-
dc_resource('quickstart-test', labels = ['quickstart'], auto_init=False)
37+
dc_resource("galoy", labels = ["galoy"], resource_deps = ["dev-ln-setup"])
38+
dc_resource("trigger", labels = ["galoy"], resource_deps = ["galoy", "dev-ln-setup"])
39+
dc_resource("otel-agent", labels = ["otel"])
40+
dc_resource("quickstart-test", labels = ["quickstart"], auto_init=False)
3641

3742
local_resource(
38-
name='dev-ln-setup',
39-
labels = ['dev-setup'],
40-
cmd='bin/dev-ln-setup.sh',
43+
name="dev-ln-setup",
44+
labels = ["dev-setup"],
45+
cmd="bin/dev-ln-setup.sh",
4146
resource_deps = galoy_services + [
4247
"init-lightning"
4348
]
4449
)
4550

4651
local_resource(
47-
name='dev-setup',
48-
labels = ['dev-setup'],
49-
cmd='bin/dev-setup.sh',
52+
name="wait-for-galoy",
53+
labels = ["dev-setup"],
54+
cmd='''
55+
GALOY_ENDPOINT=${GALOY_ENDPOINT:-localhost:4455}
56+
max_attempts=30
57+
attempt=1
58+
while [ $attempt -le $max_attempts ]; do
59+
if curl -f -X POST http://$GALOY_ENDPOINT/graphql \
60+
-H 'Content-Type: application/json' \
61+
-d '{"query":"query Globals { globals { network } }"}' 2>/dev/null; then
62+
echo "GraphQL server is ready at $GALOY_ENDPOINT!"
63+
exit 0
64+
fi
65+
echo "Attempt $attempt/$max_attempts: Waiting for GraphQL server at $GALOY_ENDPOINT..."
66+
sleep 10
67+
attempt=$((attempt + 1))
68+
done
69+
echo "GraphQL server failed to become ready at $GALOY_ENDPOINT"
70+
exit 1
71+
''',
72+
resource_deps = ["galoy"]
73+
)
74+
75+
local_resource(
76+
name="dev-setup",
77+
labels = ["dev-setup"],
78+
cmd="bin/dev-setup.sh",
5079
resource_deps = [
51-
"galoy",
52-
"dev-ln-setup"
80+
"wait-for-galoy",
5381
]
5482
)
5583

5684
local_resource(
57-
name='one-block-every-5s',
58-
labels = ['dev-setup'],
59-
serve_cmd='bin/one-block-every-5s.sh',
85+
name="one-block-every-5s",
86+
labels = ["dev-setup"],
87+
serve_cmd="bin/one-block-every-5s.sh",
6088
resource_deps = [
61-
"dev-setup"
89+
"dev-ln-setup"
6290
]
6391
)
6492

6593
# iOS E2E test
6694
local_resource(
67-
name='ios-e2e-tests',
68-
auto_init = False,
95+
name="ios-e2e-tests",
96+
auto_init = "ios-e2e-tests" in cfg.get("test", []),
6997
labels = ["test"],
70-
cmd='''
98+
cmd="""
7199
# Run the tests
72100
nix develop -c yarn e2e:test ios.sim.debug -d -R 5 --take-screenshots all --record-videos all --record-logs all --artifacts-location ./ios-recordings
73-
''',
101+
""",
74102
resource_deps = ["dev-setup"]
75103
)

0 commit comments

Comments
 (0)