Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
acoffman committed Apr 6, 2022
2 parents d9c3054 + f5ca1ff commit 4a8b8c0
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
type: string

jobs:
build_staging:
build_frontend:
runs-on: ubuntu-latest
steps:
- name: Checkout Code
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Build and deploy production

on:
release:
types: [published]
jobs:
build-production:
uses: griffithlab/civic-v2/.github/workflows/build_frontend.yml@main
with:
branch: release
deploy-staging:
uses: griffithlab/civic-v2/.github/workflows/deploy.yml@main
needs: build-production
with:
environment: production
secrets:
SSH_HOST: ${{ secrets.CIVIC_V2_PRODUCTION_SSH_HOST }}
SSH_KEY: ${{ secrets.CIVIC_V2_PRODUCTION_SSH_KEY }}

2 changes: 1 addition & 1 deletion server/config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ test:

production:
<<: *default
pool: 20
pool: 40
username: <%= Rails.application.credentials.dig(:database, :username) %>
password: <%= Rails.application.credentials.dig(:database, :password) %>

Expand Down

0 comments on commit 4a8b8c0

Please sign in to comment.