From de4663d6115cee04be4de6df28b5e1349a80c6c7 Mon Sep 17 00:00:00 2001 From: dawn Date: Wed, 23 Sep 2026 17:38:13 +0300 Subject: [PATCH] .tangled/workflows,web: retire the cloudflare dev workers for the gcp dev env Signed-off-by: dawn --- .tangled/workflows/deploy-bobbin-dev.yml | 36 -------------------- .tangled/workflows/deploy-gcp-dev.yml | 4 +-- .tangled/workflows/deploy-web-dev.yml | 43 ------------------------ web/package.json | 1 - web/scripts/deploy-cloudflare-dev.sh | 9 ----- web/wrangler.dev.jsonc | 8 +---- 6 files changed, 3 insertions(+), 98 deletions(-) delete mode 100644 .tangled/workflows/deploy-bobbin-dev.yml delete mode 100644 .tangled/workflows/deploy-web-dev.yml delete mode 100755 web/scripts/deploy-cloudflare-dev.sh diff --git a/.tangled/workflows/deploy-bobbin-dev.yml b/.tangled/workflows/deploy-bobbin-dev.yml deleted file mode 100644 index 4245655ee..000000000 --- a/.tangled/workflows/deploy-bobbin-dev.yml +++ /dev/null @@ -1,36 +0,0 @@ -when: - - event: push - branch: sv-fe - paths: - - bobbin/** - - lexicons/** - - Cargo.toml - - Cargo.lock - - rust-toolchain.toml - - .tangled/workflows/deploy-bobbin-dev.yml - -engine: microvm -image: nixos - -virtualisation: - docker: true - -dependencies: - - nodejs - - pnpm - -steps: - - name: install bobbin worker dependencies - command: | - cd bobbin/worker - pnpm install --frozen-lockfile - - - name: typecheck bobbin worker - command: | - cd bobbin/worker - pnpm run typecheck - - - name: deploy bobbin dev worker - command: | - cd bobbin/worker - CLOUDFLARE_API_TOKEN=$CLOUDFLARE_WORKER_DEPLOY_TOKEN pnpm exec wrangler deploy --config wrangler.dev.jsonc diff --git a/.tangled/workflows/deploy-gcp-dev.yml b/.tangled/workflows/deploy-gcp-dev.yml index b92cb324c..ce890adfc 100644 --- a/.tangled/workflows/deploy-gcp-dev.yml +++ b/.tangled/workflows/deploy-gcp-dev.yml @@ -37,8 +37,8 @@ environment: BOBBIN_CACHE: europe-north1-docker.pkg.dev/exemplary-proxy-507408-d6/tangled/bobbin-cache:buildcache SVFE_CACHE: europe-north1-docker.pkg.dev/exemplary-proxy-507408-d6/tangled/svfe-cache:buildcache TF_VERSION: "=1.5.7" - VITE_OAUTH_CLIENT_ID: https://svfe-next-264757501569.europe-north1.run.app/oauth-client-metadata.json - VITE_OAUTH_REDIRECT_URI: https://svfe-next-264757501569.europe-north1.run.app/oauth/callback + VITE_OAUTH_CLIENT_ID: https://next.tangled.org/oauth-client-metadata.json + VITE_OAUTH_REDIRECT_URI: https://next.tangled.org/oauth/callback steps: - name: authenticate to gcp diff --git a/.tangled/workflows/deploy-web-dev.yml b/.tangled/workflows/deploy-web-dev.yml deleted file mode 100644 index 88a5aaf8e..000000000 --- a/.tangled/workflows/deploy-web-dev.yml +++ /dev/null @@ -1,43 +0,0 @@ -when: - - event: push - branch: sv-fe - paths: - - web/** - - flake.nix - - flake.lock - - nix/pkgs/web-static-files.nix - - .tangled/workflows/deploy-web-dev.yml - -engine: microvm -image: alpine - -environment: - SVELTE_ADAPTER: cloudflare - VITE_OAUTH_CLIENT_ID: https://next.tangled.org/oauth-client-metadata.json - VITE_OAUTH_REDIRECT_URI: https://next.tangled.org/oauth/callback - -steps: - - name: install nodejs, pnpm - command: apk add nodejs pnpm - - - name: install web dependencies - command: | - cd web - pnpm install --frozen-lockfile - - - name: sync web static assets - command: | - out=$(nix build .#web-static-files --no-link --print-out-paths) - mkdir -p web/static - rm -rf web/static/fonts web/static/logos - cp -fr "$out"/* web/static - - - name: run web unit tests - command: | - cd web - pnpm run test - - - name: build and deploy web dev worker - command: | - cd web - CLOUDFLARE_API_TOKEN=$CLOUDFLARE_WORKER_DEPLOY_TOKEN pnpm run deploy:cloudflare-dev diff --git a/web/package.json b/web/package.json index 31c141bc4..14d7eaed6 100644 --- a/web/package.json +++ b/web/package.json @@ -8,7 +8,6 @@ "dev": "vite dev", "build": "vite build && node scripts/asset-headers.ts", "preview": "vite preview --host 0.0.0.0", - "deploy:cloudflare-dev": "./scripts/deploy-cloudflare-dev.sh", "deploy:cloudflare-preview": "./scripts/deploy-cloudflare-preview.sh", "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json", "lint": "prettier --check --cache . && eslint . --cache", diff --git a/web/scripts/deploy-cloudflare-dev.sh b/web/scripts/deploy-cloudflare-dev.sh deleted file mode 100755 index 66c43eb64..000000000 --- a/web/scripts/deploy-cloudflare-dev.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -set -eu - -export SVELTE_ADAPTER="${SVELTE_ADAPTER:-cloudflare}" -export VITE_OAUTH_CLIENT_ID="${VITE_OAUTH_CLIENT_ID:-https://next.tangled.org/oauth-client-metadata.json}" -export VITE_OAUTH_REDIRECT_URI="${VITE_OAUTH_REDIRECT_URI:-https://next.tangled.org/oauth/callback}" - -pnpm run build -exec pnpm exec wrangler deploy --config wrangler.dev.jsonc diff --git a/web/wrangler.dev.jsonc b/web/wrangler.dev.jsonc index 36c600e40..f67bcfd94 100644 --- a/web/wrangler.dev.jsonc +++ b/web/wrangler.dev.jsonc @@ -1,6 +1,6 @@ { "$schema": "node_modules/wrangler/config-schema.json", - "name": "svfe-dev", + "name": "svfe-preview", "main": ".svelte-kit/cloudflare/_worker.js", "workers_dev": false, "compatibility_date": "2026-07-30", @@ -26,12 +26,6 @@ "service": "sitemap-dev" } ], - "routes": [ - { - "pattern": "next.tangled.org", - "custom_domain": true - } - ], "vars": { "BOBBIN_URL": "https://next.tangled.org", "KNOTMIRROR_URL": "https://mirror-fsn.tangled.network", -- 2.51.2