Skip to content

Commit

Permalink
Merge pull request #70 from redwoodjs/staging
Browse files Browse the repository at this point in the history
Testing Branch Strategy Flow
  • Loading branch information
thedavidprice authored Sep 8, 2023
2 parents df3f5a4 + 1872663 commit a3037e9
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 9 deletions.
8 changes: 5 additions & 3 deletions .env.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@

PRISMA_HIDE_UPDATE_MESSAGE=true

REDWOOD_ENV_BASE_URL=https://ticket.redwoodjs.com
REDWOOD_ENV_SCREENSHOT_URL=https://ticket.redwoodjs.com
DATABASE_URL=postgresql://postgres@localhost:5432/partner-badges
TEST_DATABASE_URL=postgresql://postgres@localhost:5432/partner-badges-test
REDWOOD_ENV_BASE_URL=https://badge-app-staging.fly.dev
REDWOOD_ENV_SCREENSHOT_URL=https://badge-app-staging.fly.dev
RWJS_EXP_SSR_GRAPHQL_ENDPOINT=http://127.0.0.1:8910/.redwood/functions/graphql
GITHUB_OAUTH_CLIENT_ID=1ca0354cfbd95b99a884
GITHUB_OAUTH_SCOPES=read:user
GITHUB_OAUTH_REDIRECT_URI=https://ticket.redwoodjs.com/.redwood/functions/oauth/callback
GITHUB_OAUTH_REDIRECT_URI=https://badge-app-staging.fly.dev/.redwood/functions/oauth/callback
REDWOOD_ENV_CLOUDINARY_CLOUD=duh8p234y
REDWOOD_ENV_CLOUDINARY_UPLOAD_LOGOS=8FCiAN_logos
REDWOOD_ENV_CLOUDINARY_UPLOAD_BADGES=badges
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/deploy-staging.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Fly Deploy Staging
on:
push:
branches: [staging]
env:
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
jobs:
deploy:
name: 🚀 Deploy Staging
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: superfly/flyctl-actions/setup-flyctl@master
- run: flyctl deploy
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ COPY --chown=node:node --from=web_build /home/node/app/web/dist /home/node/app/w

ENV NODE_ENV=production
ENV PRISMA_HIDE_UPDATE_MESSAGE=true
ENV REDWOOD_ENV_BASE_URL=https://ticket.redwoodjs.com
ENV REDWOOD_ENV_SCREENSHOT_URL=https://ticket.redwoodjs.com
ENV REDWOOD_ENV_BASE_URL=https://badge-app-staging.fly.dev
ENV REDWOOD_ENV_SCREENSHOT_URL=https://badge-app-staging.fly.dev
ENV RWJS_EXP_SSR_GRAPHQL_ENDPOINT=http://127.0.0.1:8910/.redwood/functions/graphql
ENV GITHUB_OAUTH_CLIENT_ID=1ca0354cfbd95b99a884
ENV GITHUB_OAUTH_SCOPES=read:user
ENV GITHUB_OAUTH_REDIRECT_URI=https://ticket.redwoodjs.com/.redwood/functions/oauth/callback
ENV GITHUB_OAUTH_REDIRECT_URI=https://badge-app-staging.fly.dev/.redwood/functions/oauth/callback
ENV REDWOOD_ENV_CLOUDINARY_CLOUD=duh8p234y
ENV REDWOOD_ENV_CLOUDINARY_UPLOAD_LOGOS=8FCiAN_logos
ENV REDWOOD_ENV_CLOUDINARY_UPLOAD_BADGES=badges
Expand Down
6 changes: 3 additions & 3 deletions fly.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# fly.toml app configuration file generated for badge-app-production on 2023-09-05T12:06:31-07:00
# fly.toml app configuration file generated for badge-app-staging on 2023-09-07T13:54:23-07:00
#
# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
#

app = "badge-app-production"
app = "badge-app-staging"
primary_region = "iad"

[build]
Expand All @@ -22,5 +22,5 @@ primary_region = "iad"
force_https = true
auto_stop_machines = true
auto_start_machines = true
min_machines_running = 1
min_machines_running = 0
processes = ["app"]

0 comments on commit a3037e9

Please sign in to comment.