Skip to content

Commit 87af468

Browse files
committed
Merge branch 'dev' into stage
2 parents 08e1b98 + a1950d6 commit 87af468

File tree

4 files changed

+4
-23
lines changed

4 files changed

+4
-23
lines changed

.github/workflows/aws-deploy.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ jobs:
3838
steps:
3939
- name: Checkout repository
4040
uses: actions/checkout@v3
41+
with:
42+
ref: ${{ inputs.environment }}
4143
- name: Install AWS CLI
4244
run: sudo snap install aws-cli --classic
4345
- name: Install AWS CDK CLI

.github/workflows/deploy-dev.yaml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repos:
2020
hooks:
2121
- id: yamllint
2222
- repo: https://github.com/awslabs/cfn-python-lint
23-
rev: v1.20.1
23+
rev: v1.22.3
2424
hooks:
2525
- id: cfn-python-lint
2626
args:

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,11 +314,9 @@ OpenChallenges app.
314314

315315
The workflow for continuous integration:
316316

317-
* Create PR from the git dev branch
317+
* Create PR from the git stage branch
318318
* PR is reviewed and approved
319319
* PR is merged
320-
* CI deploys changes to the dev environment (dev.openchallenges.io) in the org-sagebase-openchallenges-dev account.
321-
* Changes are promoted (or merged) to the git stage branch.
322320
* CI deploys changes to the staging environment (stage.openchallenges.io) in the org-sagebase-openchallenges-prod account.
323321
* Changes are promoted (or merged) to the git prod branch.
324322
* CI deploys changes to the prod environment (prod.openchallenges.io) in the org-sagebase-openchallenges-prod account.

0 commit comments

Comments
 (0)