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.

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

Add .github, docker_deploy folders and .yml files to fmt-frontend. #856

Merged
merged 2 commits into from
Dec 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

on:
push:
branches: [ master ]
branches: [master]
pull_request:
branches: [ master ]
branches: [master]

jobs:
test_build:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

on:
push:
branches: [ master ]
branches: [master]
pull_request:
branches: [ master ]
branches: [master]

jobs:
lint_test_build:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: python

on:
push:
branches: [ master ]
branches: [master]
pull_request:
branches: [ master ]
branches: [master]

jobs:
lint:
Expand Down
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,8 @@
},
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[yaml]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
}
1 change: 0 additions & 1 deletion docker_deploy/group_vars/build_agent/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

aws_user: teamcity
aws_group: teamcity

Expand Down
4 changes: 2 additions & 2 deletions docker_deploy/group_vars/qa/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ aws_backup_profile: s3_read_write
aws_ecr_profile: ecr_read_only

my_aws_profiles:
- "{{ aws_backup_profile }}"
- "{{ aws_ecr_profile }}"
- "{{ aws_backup_profile }}"
- "{{ aws_ecr_profile }}"
12 changes: 5 additions & 7 deletions docker_deploy/group_vars/server/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
# Group: server
#################################################


# TheCombine is installed on the Live Server by TeamCity. It will set the
# IMAGE_TAG environment variable to major.minor.build_no and launch
# Docker compose
Expand All @@ -18,7 +17,6 @@ combine_image_certmgr: "{{ aws_ecr }}/combine/certmgr:{{ image_tag }}"
# SSL cert variables specific to Server targets
cert_mode: "letsencrypt"


aws_user: "{{ combine_user }}"
aws_group: "{{ combine_group }}"

Expand All @@ -32,10 +30,10 @@ aws_backup_profile: s3_read_write
aws_ecr_profile: ecr_read_only

my_aws_profiles:
- "{{ aws_backup_profile }}"
- "{{ aws_ecr_profile }}"
- "{{ aws_backup_profile }}"
- "{{ aws_ecr_profile }}"

# Define backup times (UTC)
backup_hour: "3"
backup_minute: "15"
num_backups: "3"
backup_hour: "3"
backup_minute: "15"
num_backups: "3"
1 change: 0 additions & 1 deletion docker_deploy/hosts.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

all:
hosts:
children:
Expand Down
1 change: 0 additions & 1 deletion docker_deploy/roles/aws_access/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

- name: check for aws version
command: aws --version
register: aws_version
Expand Down
1 change: 0 additions & 1 deletion docker_deploy/roles/combine_user/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

# create the group for the combine user
- name: create group for combine app
group:
Expand Down
2 changes: 1 addition & 1 deletion docker_deploy/roles/docker_install/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
dest: /etc/docker/daemon.json
owner: root
group: root
mode: 0600
mode: 0600
notify: restart docker

- name: Install Docker Compose
Expand Down
1 change: 0 additions & 1 deletion docker_deploy/roles/package_install/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

required_packages:
- apt-transport-https
- aptitude
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"eject": "react-scripts eject",
"fmt-backend": "dotnet-format",
"fmt-backend-check": "dotnet-format --check",
"fmt-frontend": "prettier --write \"./{.vscode,docs,public,scripts,src}/**/*.{js,jsx,ts,tsx,json,md}\"",
"fmt-frontend-check": "prettier --check \"./{.vscode,docs,public,scripts,src}/**/*.{js,jsx,ts,tsx,json,md}\"",
"fmt-frontend": "prettier --write \"./{.github,.vscode,docker_deploy,docs,public,scripts,src}/**/*.{js,jsx,ts,tsx,json,md,yml}\"",
"fmt-frontend-check": "prettier --check \"./{.github,.vscode,docker_deploy,docs,public,scripts,src}/**/*.{js,jsx,ts,tsx,json,md,yml}\"",
"frontend": "react-scripts start",
"gen-backend-coverage-report": "tsc scripts/genBackendCoverageReport.ts && node scripts/genBackendCoverageReport.js",
"import-sem-doms": "tsc scripts/importSemanticDomains.ts && node scripts/importSemanticDomains.js",
Expand Down