Skip to content

Commit ae8df6d

Browse files
tytan652derrod
authored andcommitted
Migrate to Wrangler 2
Wrangler (legacy) is depecated and no longer supported by CloudFlare. `wrangler build` has been removed in Wrangler 2. worker crate has been updated to its latest version to enable Wrangler 2 support.
1 parent 7cc0eee commit ae8df6d

File tree

3 files changed

+8
-18
lines changed

3 files changed

+8
-18
lines changed

.github/workflows/cf_deploy.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ jobs:
2424
uses: Swatinem/rust-cache@v1
2525

2626
- name: Install wrangler
27-
run: cargo install wrangler
27+
run: npm install -g wrangler
2828

29-
- name: Build
29+
- name: Build
3030
if: github.event_name != 'workflow_dispatch'
31-
run: wrangler build
31+
run: wrangler publish --dry-run
3232

3333
- name: Publish
3434
if: github.event_name == 'workflow_dispatch'
3535
run: wrangler publish
3636
env:
37-
CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
37+
CLOUDFLARE_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
3838

3939
- name: Publish secrets
4040
if: github.event_name == 'workflow_dispatch' && github.event.inputs.update_secrets == 'true'
@@ -44,4 +44,4 @@ jobs:
4444
echo '${{ secrets.RESTREAM_ID }}' | wrangler secret put "RESTREAM_ID"
4545
echo '${{ secrets.RESTREAM_SECRET }}' | wrangler secret put "RESTREAM_SECRET"
4646
env:
47-
CF_API_TOKEN: ${{ secrets.CF_API_TOKEN }}
47+
CLOUDFLARE_API_TOKEN: ${{ secrets.CF_API_TOKEN }}

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ default = ["console_error_panic_hook"]
1414

1515
[dependencies]
1616
cfg-if = "0.1.2"
17-
worker = "0.0.9"
17+
worker = "0.0.15"
1818
serde_urlencoded = "0.7.1"
1919
serde_json = "1.0.67"
2020
serde = "1.0.136"

wrangler.toml

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name = "obs-oauth-cf"
2-
type = "javascript"
3-
workers_dev = true
4-
compatibility_date = "2022-03-29"
2+
compatibility_date = "2022-05-15"
3+
main = "build/worker/shim.mjs"
54

65
[vars]
76
TWITCH_REDIRECT_URL = "https://auth.obsproject.com/v1/twitch/finalise"
@@ -12,14 +11,5 @@ RESTREAM_LEGACY_REDIRECT_URL = "https://obsproject.com/app-auth/restream-auth.ph
1211
[build]
1312
command = "cargo install -q worker-build && worker-build --release" # required
1413

15-
[build.upload]
16-
dir = "build/worker"
17-
format = "modules"
18-
main = "./shim.mjs"
19-
20-
[[build.upload.rules]]
21-
globs = ["**/*.wasm"]
22-
type = "CompiledWasm"
23-
2414
# read more about configuring your Worker via wrangler.toml at:
2515
# https://developers.cloudflare.com/workers/cli-wrangler/configuration

0 commit comments

Comments
 (0)