Skip to content

Commit 1a28d65

Browse files
authored
Merge pull request #22 from gentlementlegen/fix/base-name-wrangler
feat: only the global name is considered for automatic deployment
2 parents 7e17676 + dbb9b22 commit 1a28d65

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

.github/workflows/worker-delete.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Retrieve and Construct Full Worker Name
2727
id: construct_worker_name
2828
run: |
29-
base_name=$(grep '^name = ' wrangler.toml | sed 's/^name = "\(.*\)"$/\1/')
29+
base_name=$(grep '^name = ' wrangler.toml | head -n 1 | sed 's/^name = "\(.*\)"$/\1/')
3030
full_worker_name="${base_name}-${{ env.branch_name }}"
3131
# Make sure that it doesnt exceed 63 characters or it will break RFC 1035
3232
full_worker_name=$(echo "${full_worker_name}" | cut -c 1-63)

.github/workflows/worker-deploy.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,18 @@ jobs:
2323
run: |
2424
branch_name=$(echo '${{ github.event.ref }}' | sed 's#refs/heads/##' | sed 's#[^a-zA-Z0-9]#-#g')
2525
# Extract base name from wrangler.toml
26-
base_name=$(grep '^name = ' wrangler.toml | sed 's/^name = "\(.*\)"$/\1/')
26+
base_name=$(grep '^name = ' wrangler.toml | head -n 1 | sed 's/^name = "\(.*\)"$/\1/')
2727
# Concatenate branch name with base name
2828
new_name="${base_name}-${branch_name}"
2929
# Truncate the new name to 63 characters for RFC 1035
3030
new_name=$(echo "$new_name" | cut -c 1-63)
3131
# Update the wrangler.toml file
32-
sed -i "s/^name = .*/name = \"$new_name\"/" wrangler.toml
32+
sed -i '0,/^name = .*/{s/^name = .*/name = "'"$new_name"'"/}' wrangler.toml
3333
echo "Updated wrangler.toml name to: $new_name"
3434
- name: Deploy with Wrangler
3535
id: wrangler_deploy
3636
uses: cloudflare/wrangler-action@v3
3737
with:
38-
wranglerVersion: "3.57.0"
3938
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
4039
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
4140
secrets: |

0 commit comments

Comments
 (0)