-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #102 from GSA-TTS/update-github-actions
Update CI code for GitHub Actions and CircleCI
- Loading branch information
Showing
29 changed files
with
151 additions
and
237 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| version: 2.1 | ||
|
|
||
| orbs: | ||
| ruby: circleci/[email protected].0 | ||
| node: circleci/node@5.0.0 | ||
| browser-tools: circleci/browser-tools@1.2.3<% if terraform? %> | ||
| terraform: circleci/terraform@3.0.0<% end %> | ||
| ruby: circleci/ruby@2.1.3 | ||
| node: circleci/node@5.2.0 | ||
| browser-tools: circleci/browser-tools@1.4.8<% if terraform? %> | ||
| terraform: circleci/terraform@3.2.1<% end %> | ||
|
|
||
| commands: | ||
| setup-project: | ||
|
|
@@ -75,7 +75,7 @@ jobs: | |
| parallelism: 3 | ||
| docker: | ||
| - image: cimg/ruby:<%= ruby_version %> | ||
| - image: cimg/postgres:12.9 | ||
| - image: cimg/postgres:15.7 | ||
| environment: | ||
| POSTGRES_USER: circleci | ||
| POSTGRES_DB: <%= app_name %>_test | ||
|
|
@@ -149,7 +149,7 @@ jobs: | |
|
|
||
| owasp_scan: | ||
| machine: | ||
| image: ubuntu-2004:202111-02 | ||
| image: ubuntu-2204:current | ||
| steps: | ||
| - checkout | ||
|
|
||
|
|
@@ -172,14 +172,14 @@ jobs: | |
| name: Run OWASP Zap | ||
| command: | | ||
| docker run -v $(pwd)/zap.conf:/zap/wrk/zap.conf:ro -v $(pwd)/reports:/zap/wrk:rw --rm \ | ||
| --user zap:$(id -g) --network="project_ci_network" -t owasp/zap2docker-weekly \ | ||
| --user zap:$(id -g) --network="project_ci_network" -t ghcr.io/zaproxy/zaproxy:weekly \ | ||
| zap-baseline.py -t http://web:3000 -c zap.conf -I -i -r owasp_report.html | ||
| - store_artifacts: | ||
| path: reports/owasp_report.html | ||
|
|
||
| owasp_full_scan: | ||
| machine: | ||
| image: ubuntu-2004:202111-02 | ||
| image: ubuntu-2204:current | ||
| steps: | ||
| - checkout | ||
|
|
||
|
|
@@ -202,15 +202,15 @@ jobs: | |
| name: Run OWASP Zap | ||
| command: | | ||
| docker run -v $(pwd)/zap.conf:/zap/wrk/zap.conf:ro -v $(pwd)/reports:/zap/wrk:rw --rm \ | ||
| --user zap:$(id -g) --network="project_ci_network" -t owasp/zap2docker-weekly \ | ||
| --user zap:$(id -g) --network="project_ci_network" -t ghcr.io/zaproxy/zaproxy:weekly \ | ||
| zap-full-scan.py -t http://web:3000 -c zap.conf -I -i -r owasp_report.html | ||
| - store_artifacts: | ||
| path: reports/owasp_report.html | ||
|
|
||
| a11y_scan: | ||
| docker: | ||
| - image: cimg/ruby:<%= ruby_version %> | ||
| - image: cimg/postgres:12.9 | ||
| - image: cimg/postgres:15.7 | ||
| environment: | ||
| POSTGRES_USER: circleci | ||
| POSTGRES_DB: <%= app_name %>_development | ||
|
|
@@ -262,7 +262,7 @@ jobs: | |
|
|
||
| - run: | ||
| name: Run pa11y-ci | ||
| command: yarn run pa11y-ci | ||
| command: yarn run pa11y-ci -c pa11yci.js | ||
| <% if terraform? %> | ||
| terraform_plan_staging: | ||
| executor: terraform/default | ||
|
|
@@ -290,7 +290,7 @@ jobs: | |
| - checkout | ||
| - attach_workspace: | ||
| at: . | ||
| - terraform/apply | ||
| - terraform/apply: | ||
| path: terraform/staging | ||
| terraform_plan_production: | ||
| executor: terraform/default | ||
|
|
@@ -318,7 +318,7 @@ jobs: | |
| - checkout | ||
| - attach_workspace: | ||
| at: . | ||
| - terraform/apply | ||
| - terraform/apply: | ||
| path: terraform/production | ||
| <% end %> | ||
| deploy_staging: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,47 +7,36 @@ on: | |
| - 'doc/**' | ||
| - 'README.md' | ||
|
|
||
| permissions: | ||
| contents: read | ||
| pull-requests: write | ||
|
|
||
| jobs: | ||
| deploy: | ||
| name: Deploy to production | ||
| runs-on: ubuntu-latest | ||
| environment: production | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| with: | ||
| fetch-depth: 2 | ||
| - uses: actions/checkout@v4 | ||
| <% if terraform? %> | ||
| - name: Check for changes to Terraform | ||
| id: changed-terraform-files | ||
| uses: tj-actions/[email protected] | ||
| with: | ||
| files: | | ||
| terraform/shared | ||
| terraform/production | ||
| - name: Terraform init | ||
| if: steps.changed-terraform-files.outputs.any_changed == 'true' | ||
| working-directory: terraform/production | ||
| env: | ||
| AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }} | ||
| AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }} | ||
| run: terraform init | ||
| - name: Terraform apply | ||
| if: steps.changed-terraform-files.outputs.any_changed == 'true' | ||
| working-directory: terraform/production | ||
| uses: dflook/terraform-apply@v1 | ||
| env: | ||
| AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }} | ||
| AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }} | ||
| TF_VAR_cf_user: ${{ secrets.CF_USERNAME }} | ||
| TF_VAR_cf_password: ${{ secrets.CF_PASSWORD }} | ||
| run: terraform apply -auto-approve -input=false | ||
| with: | ||
| path: terraform/production | ||
| backend_config: > | ||
| access_key=${{ secrets.TERRAFORM_STATE_ACCESS_KEY }} | ||
| secret_key=${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }} | ||
| <% end %> | ||
| - name: Deploy app | ||
| uses: cloud-gov/cg-cli-tools@main | ||
| env: | ||
| RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }} | ||
| with: | ||
| cf_username: ${{ secrets.CF_USERNAME }} | ||
| cf_password: ${{ secrets.CF_PASSWORD }} | ||
| cf_org: <%= cloud_gov_organization %> | ||
| cf_space: <%= cloud_gov_production_space %> | ||
| cf_command: push -vars-file config/deployment/production.yml --var rails_master_key=${{ env.RAILS_MASTER_KEY }} --strategy rolling | ||
| cf_command: push --vars-file config/deployment/production.yml --var rails_master_key="${{ secrets.RAILS_MASTER_KEY }}" --strategy rolling | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,47 +7,36 @@ on: | |
| - 'doc/**' | ||
| - 'README.md' | ||
|
|
||
| permissions: | ||
| contents: read | ||
| pull-requests: write | ||
|
|
||
| jobs: | ||
| deploy: | ||
| name: Deploy to staging | ||
| runs-on: ubuntu-latest | ||
| environment: staging | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| with: | ||
| fetch-depth: 2 | ||
| - uses: actions/checkout@v4 | ||
| <% if terraform? %> | ||
| - name: Check for changes to Terraform | ||
| id: changed-terraform-files | ||
| uses: tj-actions/[email protected] | ||
| with: | ||
| files: | | ||
| terraform/shared | ||
| terraform/staging | ||
| - name: Terraform init | ||
| if: steps.changed-terraform-files.outputs.any_changed == 'true' | ||
| working-directory: terraform/staging | ||
| env: | ||
| AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }} | ||
| AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }} | ||
| run: terraform init | ||
| - name: Terraform apply | ||
| if: steps.changed-terraform-files.outputs.any_changed == 'true' | ||
| working-directory: terraform/staging | ||
| uses: dflook/terraform-apply@v1 | ||
| env: | ||
| AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }} | ||
| AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }} | ||
| TF_VAR_cf_user: ${{ secrets.CF_USERNAME }} | ||
| TF_VAR_cf_password: ${{ secrets.CF_PASSWORD }} | ||
| run: terraform apply -auto-approve -input=false | ||
| with: | ||
| path: terraform/staging | ||
| backend_config: > | ||
| access_key=${{ secrets.TERRAFORM_STATE_ACCESS_KEY }} | ||
| secret_key=${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }} | ||
| <% end %> | ||
| - name: Deploy app | ||
| uses: cloud-gov/cg-cli-tools@main | ||
| env: | ||
| RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }} | ||
| with: | ||
| cf_username: ${{ secrets.CF_USERNAME }} | ||
| cf_password: ${{ secrets.CF_PASSWORD }} | ||
| cf_org: <%= cloud_gov_organization %> | ||
| cf_space: <%= cloud_gov_staging_space %> | ||
| cf_command: push -vars-file config/deployment/staging.yml --var rails_master_key=${{ env.RAILS_MASTER_KEY }} --strategy rolling | ||
| cf_command: push --vars-file config/deployment/staging.yml --var rails_master_key="${{ secrets.RAILS_MASTER_KEY }}" --strategy rolling | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.