Skip to content

Commit 38c92c7

Browse files
committed
refactor: 💡 prepare cf wrangler jsonc
1 parent 26bfd8f commit 38c92c7

File tree

3 files changed

+46
-28
lines changed

3 files changed

+46
-28
lines changed

.github/workflows/fleek-deploy-common.yml

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -108,36 +108,14 @@ jobs:
108108
109109
- name: Prepare wrangler.jsonc
110110
run: |
111-
wranglerConfig="wrangler.jsonc"
112-
tempConfig="temp.jsonc"
113-
projectName="fleek-xyz"
114-
projectRoute="${{ vars.PUBLIC_FLEEK_CF_PROJECT_ROUTE }}"
115111
environment="${{ inputs.environment }}"
112+
projectName="$projectName-$environment"
113+
projectRoute="${{ vars.PUBLIC_FLEEK_CF_PROJECT_ROUTE }}"
116114
117-
if [[ "$environment" == "production" ]]; then
118-
jq --arg projectName "$projectName-$TARGET_ENVIRONMENT" \
119-
--arg projectRoute "$projectRoute" \
120-
'
121-
.env.production.name = $projectName |
122-
.env.production.route = $projectRoute |
123-
124-
.workers_dev = false
125-
' \
126-
"$wranglerConfig" > "$tempConfig" \
127-
&& mv "$tempConfig" "$wranglerConfig"
128-
else
129-
jq --arg projectName "$projectName-$environment" \
130-
--arg projectRoute "$projectRoute" \
131-
'
132-
.workers_dev = true |
133-
.env.staging.name = $projectName
134-
' \
135-
"$wranglerConfig" > "$tempConfig" \
136-
&& mv "$tempConfig" "$wranglerConfig"
137-
fi
138-
139-
echo "🤖 Wrangler config"
140-
cat "$wranglerConfig"
115+
./scripts/prepare-cf-wrangler \
116+
"$environment" \
117+
"$projectName" \
118+
"$projectRoute"
141119
142120
- name: Build
143121
run: |

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,13 @@ pnpm-lock.yaml
4141

4242
# dev
4343
dev_*
44+
test-*
4445

4546
# external apps
4647
public/dashboard/
4748
public/agents/
4849
public/eliza/
4950
public/**/defined_overrides.json
51+
52+
# cf
53+
.wrangler

scripts/prepare-cf-wrangler

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/bin/bash
2+
3+
environment="$1"
4+
projectName="$2"
5+
projectRoute="$3"
6+
7+
if [[ -z "$1" || -z "$2" || -z "$3" || -z "$4" ]]; then
8+
echo "👹 Oops! Missing arguments, e.g. github token, organisation repository, artifact name, etc"
9+
exit 1
10+
fi
11+
12+
wranglerConfig="wrangler.jsonc"
13+
tempConfig="temp.jsonc"
14+
15+
if [[ "$environment" == "production" ]]; then
16+
jq --arg projectName "$projectName-$environment" \
17+
--arg projectRoute "$projectRoute" \
18+
'
19+
.workers_dev = true |
20+
.env.production.name = $projectName
21+
' \
22+
"$wranglerConfig" > "$tempConfig" \
23+
&& mv "$tempConfig" "$wranglerConfig"
24+
else
25+
jq --arg projectName "$projectName-$environment" \
26+
--arg projectRoute "$projectRoute" \
27+
'
28+
.workers_dev = true |
29+
.env.staging.name = $projectName
30+
' \
31+
"$wranglerConfig" > "$tempConfig" \
32+
&& mv "$tempConfig" "$wranglerConfig"
33+
fi
34+
35+
echo "🤖 Wrangler config"
36+
cat "$wranglerConfig"

0 commit comments

Comments
 (0)