feat: deploy on v* tag, update terraform to support email routing and router for nightly site/docs

Author: reecelikesramen

.github/workflows/deploy.yml

@@ -0,0 +1,46 @@
+name: Deploy Landing Site
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - "v*"
+
+jobs:
+  deploy-landing:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      deployments: write
+    name: Deploy Landing Site
+    steps:
+      - uses: actions/checkout@v4
+      
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+      
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8
+
+      - name: Install dependencies
+        working-directory: site
+        run: pnpm install
+
+      - name: Build
+        working-directory: site
+        run: pnpm run build
+
+      - name: Deploy to Cloudflare Pages
+        uses: cloudflare/pages-action@v1
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          projectName: pywire-landing
+          directory: site/dist
+          gitHubToken: ${{ secrets.GITHUB_TOKEN }}
+          branch: ${{ github.ref_name == 'main' && 'nightly' || 'main' }}

.gitignore

@@ -5,6 +5,7 @@
 # Terraform state files (contain secrets in plain text!)
 terraform.tfstate
 terraform.tfstate.backup
+terraform.tfstate.*.backup
 .terraform/
 .terraform.lock.hcl
 

infra/main.tf

@@ -11,36 +11,14 @@ provider "cloudflare" {
   api_token = var.cloudflare_api_token
 }
 
-variable "account_id" {
-  type = string
-}
-
-variable "cloudflare_api_token" {
-  type      = string
-  sensitive = true
-}
-
-# Add this block!
-variable "zone_id" {
-  type = string
-}
-
 # --- 1. The Documentation Site (Project A) ---
 # Connects to the 'pywire/pywire' repo
 resource "cloudflare_pages_project" "docs" {
   account_id        = var.account_id
   name              = "pywire-docs"
   production_branch = "main"
 
-  source = {
-    type = "github"
-    config = {
-      owner                         = "pywire"
-      repo_name                     = "pywire"
-      production_deployment_enabled = true
-      pr_comments_enabled           = true
-    }
-  }
+
 
   build_config = {
     root_dir        = "docs"
@@ -54,15 +32,6 @@ resource "cloudflare_pages_project" "landing" {
   name              = "pywire-landing"
   production_branch = "main"
 
-  source = {
-    type = "github"
-    config = {
-      owner                         = "pywire"
-      repo_name                     = "pywire.dev"
-      production_deployment_enabled = true
-    }
-  }
-
   build_config = {
     root_dir        = "site"
     build_command   = "pnpm run build"
@@ -79,9 +48,96 @@ resource "cloudflare_workers_script" "router" {
   main_module    = "index.js"
 }
 
+# --- Nightly Environment ---
+# 1. DNS Record
+resource "cloudflare_dns_record" "nightly" {
+  zone_id = var.zone_id
+  name    = "nightly"
+  content = cloudflare_pages_project.landing.subdomain
+  type    = "CNAME"
+  proxied = true
+  ttl     = 1
+}
+
+
+
+
 # --- 4. The DNS & Routing ---
 resource "cloudflare_workers_route" "catch_all" {
   zone_id     = var.zone_id
   pattern     = "pywire.dev/*"
   script      = cloudflare_workers_script.router.script_name
 }
+
+resource "cloudflare_workers_route" "nightly" {
+  zone_id     = var.zone_id
+  pattern     = "nightly.pywire.dev/*"
+  script      = cloudflare_workers_script.router.script_name
+}
+
+# --- 5. Email Routing Setup ---
+
+resource "cloudflare_email_routing_settings" "main" {
+  zone_id = var.zone_id
+}
+
+
+
+# Destination Registration
+# Helper to find every unique email address across both variables
+locals {
+  all_unique_emails = distinct(concat(
+    values(var.forwarding_rules), 
+    var.maintainer_emails
+  ))
+}
+
+# Register every email found in your variables
+resource "cloudflare_email_routing_address" "destinations" {
+  for_each   = toset(local.all_unique_emails)
+  account_id = var.account_id
+  email      = each.value
+}
+
+# Individual Rules
+resource "cloudflare_email_routing_rule" "individual_aliases" {
+  for_each = var.forwarding_rules
+
+  zone_id = var.zone_id
+  name    = "Forward: ${each.key}@"
+  enabled = true
+
+  matchers = [{
+    type  = "literal"
+    field = "to"
+    value = "${each.key}@pywire.dev"
+  }]
+
+  actions = [{
+    type  = "forward"
+    # Look up the verified address resource
+    value = [cloudflare_email_routing_address.destinations[each.value].email]
+  }]
+}
+
+# The Maintainers Group Rule
+resource "cloudflare_email_routing_rule" "maintainers_group" {
+  zone_id = var.zone_id
+  name    = "Group: Maintainers"
+  enabled = true
+
+  matchers = [{
+    type  = "literal"
+    field = "to"
+    value = "maintainers@pywire.dev"
+  }]
+
+  actions = [{
+    type = "forward"
+    # Dynamically grab the verified email ID for everyone in the list
+    value = [
+      for email in var.maintainer_emails : 
+      cloudflare_email_routing_address.destinations[email].email
+    ]
+  }]
+}

infra/variables.tf

@@ -0,0 +1,22 @@
+variable "account_id" {
+  type = string
+}
+
+variable "cloudflare_api_token" {
+  type      = string
+  sensitive = true
+}
+
+variable "zone_id" {
+  type = string
+}
+
+variable "forwarding_rules" {
+  description = "Map of alias to destination (1-to-1). Example: { 'hello' = 'me@fastmail.com' }"
+  type        = map(string)
+}
+
+variable "maintainer_emails" {
+  description = "List of emails that receive the 'maintainers@' broadcast"
+  type        = list(string)
+}

worker/src/index.js

@@ -3,6 +3,14 @@ export default {
     const url = new URL(request.url);
     const path = url.pathname;
 
+    // --- 0. DETERMINE ENVIRONMENT ---
+    const hostname = url.hostname;
+    const isNightly = hostname.startsWith("nightly.");
+
+    // Define base targets based on environment
+    const landingTarget = isNightly ? "nightly.pywire-landing.pages.dev" : "pywire-landing.pages.dev";
+    const docsTarget = isNightly ? "nightly.pywire-docs.pages.dev" : "pywire-docs.pages.dev";
+
     // --- 1. HANDLE SHORTCUT REDIRECTS ---
     const redirects = {
       // "/discord": "https://discord.gg/pywire", // Update this!
@@ -39,10 +47,10 @@ export default {
     if (path.startsWith("/docs")) {
       // Strip "/docs" so the origin sees "/_astro/..." or "/"
       const newPath = path.replace(/^\/docs/, "") || "/";
-      return proxy("pywire-docs.pages.dev", newPath);
+      return proxy(docsTarget, newPath);
     }
 
     // --- 4. ROUTE TO LANDING ---
-    return proxy("pywire-landing.pages.dev");
+    return proxy(landingTarget);
   },
 };