Skip to content

Reverse merge from master to dev#259

Merged
jaypatrick merged 18 commits intodevfrom
master
Feb 3, 2026
Merged

Reverse merge from master to dev#259
jaypatrick merged 18 commits intodevfrom
master

Conversation

@jaypatrick
Copy link
Owner

No description provided.

jaypatrick and others added 18 commits February 3, 2026 15:36
- Add layered .env file structure (.env, .env.development, .env.production)
- Environment automatically selected based on git branch via .envrc
- Base config in .env (no secrets)
- Development config with test Turnstile keys
- Production config with placeholders
- All secrets moved to .env.local (not committed)
- Update wrangler.toml with environment-specific configurations
- Add comprehensive documentation in .env.README.md
- Update .gitignore to allow base config files while keeping secrets ignored

Loading order: .env → .env.$ENV → .env.local
Branch mapping: dev/develop → development, main/master → production

Co-Authored-By: Warp <agent@warp.dev>
- Create reusable composite action .github/actions/setup-env
- Automatically detects environment from branch name (same logic as .envrc)
- Loads .env and .env.$ENV files into workflow environment
- Update CI workflow to use environment loading action
- Add comprehensive documentation in .github/ENV_SETUP.md
- Include GitHub Actions quickstart in .env.README.md

The setup-env action provides:
- Branch to environment mapping (main/master → production, dev/develop → development)
- Automatic loading of layered .env files
- Environment output for conditional workflow logic
- Verification step to confirm variables loaded

Co-Authored-By: Warp <agent@warp.dev>
- Remove .envrc from .gitignore
- .envrc contains the environment loading logic needed for local development
- No secrets in .envrc - all secrets remain in .env.local (still ignored)

Co-Authored-By: Warp <agent@warp.dev>
The root .envrc now handles all environment loading with proper
layered configuration. The worker/.envrc is no longer needed and
contained outdated hardcoded values.

Co-Authored-By: Warp <agent@warp.dev>
…ines

Co-authored-by: jaypatrick <1800595+jaypatrick@users.noreply.github.com>
[WIP] Implement layered environment configuration system
- Fix GitHub Actions setup-env to properly parse dotenv files (strip quotes, handle comments)
- Update .envrc to use direnv's built-in dotenv loader instead of custom function
- Update .env COMPILER_VERSION from 0.8.3 to 0.11.4 to match deno.json
- Remove DENO_DIR from base .env (breaks GitHub Actions on /app/.deno path)
- Fix .env.production to use empty placeholders for Turnstile keys
- Update .env.production documentation to clarify wrangler secret usage
- Fix wrangler.toml localConnectionString to use real connection string template
- Update .github/ENV_SETUP.md branch mapping table to match actual behavior
- Fix .env.README.md to clarify .envrc should be committed
- Update deno.json dev task to remove --env=.envrc flag (now handled by direnv)

Co-authored-by: jaypatrick <1800595+jaypatrick@users.noreply.github.com>
Fix environment configuration parsing and documentation issues
Co-authored-by: jaypatrick <1800595+jaypatrick@users.noreply.github.com>
Fix markdown formatting violations in .env.README.md
Implement layered environment configuration system
- Add .dockerignore to exclude secrets and unnecessary files
- Update docker-compose.yml to use env_file with layered loading
- Update docker-compose.override.yml with secrets template
- Add docker-compose.prod.yml for production deployments
- Create DOCKER.md with comprehensive Docker documentation

Changes:
- Docker now loads .env and .env.${ENV} files automatically
- Secrets excluded from builds via .dockerignore
- Production uses environment variables for secrets
- Development supports live code reloading
- Added resource limits for production
- Comprehensive troubleshooting and security guidelines

Co-Authored-By: Warp <agent@warp.dev>
Co-authored-by: jaypatrick <1800595+jaypatrick@users.noreply.github.com>
Fix Deno formatting in Docker configuration files
@cloudflare-workers-and-pages
Copy link

Deploying with  Cloudflare Workers  Cloudflare Workers

The latest updates on your project. Learn more about integrating Git with Workers.

Status Name Latest Commit Updated (UTC)
✅ Deployment successful!
View logs
adblock-compiler d1c416b Feb 03 2026, 10:02 PM

@jaypatrick jaypatrick self-assigned this Feb 3, 2026
@jaypatrick jaypatrick marked this pull request as ready for review February 3, 2026 22:02
@jaypatrick jaypatrick merged commit f2c5aa4 into dev Feb 3, 2026
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants