Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adjusted workflows for ssh and new dev url #717

Merged
merged 1 commit into from
Jun 27, 2020
Merged

adjusted workflows for ssh and new dev url #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/Continuous_Deployment_Backend_Dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
uses: appleboy/ssh-action@master
with:
username: ec2-user
host: ${{ secrets.AWS_HOST_DEV }}
key: ${{ secrets.AWS_PEM_KEY }}
host: ${{ secrets.AWS_SSH_HOST_DEV }}
key: ${{ secrets.AWS_SSH_PEM_KEY }}
script: |
set -e
cd 311-data/server
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Continuous_Deployment_Backend_Prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
uses: appleboy/ssh-action@master
with:
username: ec2-user
host: ${{ secrets.AWS_HOST_PROD }}
key: ${{ secrets.AWS_PEM_KEY }}
host: ${{ secrets.AWS_SSH_HOST_PROD }}
key: ${{ secrets.AWS_SSH_PEM_KEY }}
script: |
set -e
cd 311-data/server
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/Daily_Backend_Update.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Daily_Backend_Update

on:
schedule:
- cron: '0 0 * * *'
- cron: '0 7 * * *'

jobs:
dev_update:
Expand All @@ -12,8 +12,8 @@ jobs:
uses: appleboy/ssh-action@master
with:
username: ec2-user
host: ${{ secrets.AWS_HOST_DEV }}
key: ${{ secrets.AWS_PEM_KEY }}
host: ${{ secrets.AWS_SSH_HOST_DEV }}
key: ${{ secrets.AWS_SSH_PEM_KEY }}
command_timeout: 60m
script: |
set -e
Expand All @@ -27,8 +27,8 @@ jobs:
uses: appleboy/ssh-action@master
with:
username: ec2-user
host: ${{ secrets.AWS_HOST_PROD }}
key: ${{ secrets.AWS_PEM_KEY }}
host: ${{ secrets.AWS_SSH_HOST_PROD }}
key: ${{ secrets.AWS_SSH_PEM_KEY }}
command_timeout: 60m
script: |
set -e
Expand Down
3 changes: 2 additions & 1 deletion server/postman/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ Click the Import button at the top left, select "Folder" from the tabs, and then
- **311-all**: a collection containing all of the endpoints that the api currently supports, with prepopulated params for each api call.
- **311-CI**: a collection containing all of the tests we run during continuous integration. These include tests for bad input -- e.g., a missing required param should return 400, an unsupported endpoint should return a 404.

The import will also add two environments:
The import will also add three environments:
- **311-local**: all api calls go to your local server (which should be running)
- **311-dev**: api calls go to the dev server
- **311-prod**: api calls go to the production server

### 4. Activate the `311-local` environment.
Expand Down
4 changes: 2 additions & 2 deletions server/postman/environments/311-dev.postman_environment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
"values": [
{
"key": "base_url",
"value": "https://dev-api.311-data.org",
"value": "http://dev-api.311-data.org",
"enabled": true
}
],
"_postman_variable_scope": "environment",
"_postman_exported_at": "2020-06-26T21:24:24.657Z",
"_postman_exported_at": "2020-06-27T14:04:02.720Z",
"_postman_exported_using": "Postman/7.26.1"
}