From 90c095e7c266a0285cddc82aa8107bb8a5b07720 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Tue, 1 Nov 2022 14:30:53 -0400 Subject: [PATCH 1/7] new dev ci-cd --- .github/pull_request_template.md | 16 ++++++++++++++++ .github/workflows/docker-cd-dev.yml | 26 ++++++++++++++++++++++++++ .github/workflows/docker-ci.yml | 2 +- 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 .github/pull_request_template.md create mode 100644 .github/workflows/docker-cd-dev.yml diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000..76f4e2d4 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,16 @@ +## Describe your changes + +Please include a summary of the changes and the related issue/task. Please also include relevant motivation and context. List any dependencies that are required for this change, including links to other pull requests/branches in other repositories if applicable. + +## Issue ticket number and Jira link + +Please include the Jira Ticket Number and Link for this issue/task. + +## Checklist before requesting a review +- [ ] I have performed a self-review of my code +- [ ] Ensure the target / base branch for any feature PR is set to `dev` not master (the only exception to this is releases from `dev` and hotfix branches) + +## Workflow + +Owner of the Pull Request will be responsible for merge after all requirements are met, including approval from at least one reviewer. Additional changes made after a review will dismiss any approvals and require re-review of the additional updates. Auto merging can be enabled below if additional changes are likely not to be needed. + diff --git a/.github/workflows/docker-cd-dev.yml b/.github/workflows/docker-cd-dev.yml new file mode 100644 index 00000000..beb9ec57 --- /dev/null +++ b/.github/workflows/docker-cd-dev.yml @@ -0,0 +1,26 @@ +name: Docker Image CD + +on: + push: + branches: [ dev ] + workflow_dispatch: + +jobs: + docker-cd: + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + + - name: Log in to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_TOKEN }} + + - name: Build and push Server Docker image + uses: docker/build-push-action@v2 + with: + context: . + push: true + tags: codexrems/dtr:REMSvDevelopment diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml index f2ee2142..53470896 100644 --- a/.github/workflows/docker-ci.yml +++ b/.github/workflows/docker-ci.yml @@ -2,7 +2,7 @@ name: Docker Image CI on: pull_request: - branches: [ master ] + branches: [ master, dev ] workflow_dispatch: From 6e76d1ab4b561913282fdbc94f40043f0265a274 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Tue, 1 Nov 2022 14:36:43 -0400 Subject: [PATCH 2/7] update dev cd name --- .github/workflows/docker-cd-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-cd-dev.yml b/.github/workflows/docker-cd-dev.yml index beb9ec57..23f419e9 100644 --- a/.github/workflows/docker-cd-dev.yml +++ b/.github/workflows/docker-cd-dev.yml @@ -1,4 +1,4 @@ -name: Docker Image CD +name: Docker Image Development CD on: push: From 929a4bdcd72be66cdb4ec1195aac8ee71461dbd6 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Wed, 2 Nov 2022 13:37:52 -0400 Subject: [PATCH 3/7] pr template update --- .github/pull_request_template.md | 2 +- .github/workflows/docker-cd-dev.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 76f4e2d4..99052a59 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -12,5 +12,5 @@ Please include the Jira Ticket Number and Link for this issue/task. ## Workflow -Owner of the Pull Request will be responsible for merge after all requirements are met, including approval from at least one reviewer. Additional changes made after a review will dismiss any approvals and require re-review of the additional updates. Auto merging can be enabled below if additional changes are likely not to be needed. +Owner of the Pull Request will be responsible for merge after all requirements are met, including approval from at least one reviewer. Additional changes made after a review will dismiss any approvals and require re-review of the additional updates. Auto merging can be enabled below if additional changes are likely not to be needed. The bot will auto assign reviewers to your Pull Request for you. diff --git a/.github/workflows/docker-cd-dev.yml b/.github/workflows/docker-cd-dev.yml index 23f419e9..16c3bdc5 100644 --- a/.github/workflows/docker-cd-dev.yml +++ b/.github/workflows/docker-cd-dev.yml @@ -23,4 +23,4 @@ jobs: with: context: . push: true - tags: codexrems/dtr:REMSvDevelopment + tags: codexrems/dtr:REMSvExperimental From 79555f153a5d95c4831ae2c6fdfca9d3c536970c Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Wed, 2 Nov 2022 13:42:23 -0400 Subject: [PATCH 4/7] changed master to main --- .github/pull_request_template.md | 2 +- .github/workflows/docker-cd.yml | 2 +- .github/workflows/docker-ci.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 99052a59..d6c3f687 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -8,7 +8,7 @@ Please include the Jira Ticket Number and Link for this issue/task. ## Checklist before requesting a review - [ ] I have performed a self-review of my code -- [ ] Ensure the target / base branch for any feature PR is set to `dev` not master (the only exception to this is releases from `dev` and hotfix branches) +- [ ] Ensure the target / base branch for any feature PR is set to `dev` not main (the only exception to this is releases from `dev` and hotfix branches) ## Workflow diff --git a/.github/workflows/docker-cd.yml b/.github/workflows/docker-cd.yml index fc246c67..b68641b9 100644 --- a/.github/workflows/docker-cd.yml +++ b/.github/workflows/docker-cd.yml @@ -2,7 +2,7 @@ name: Docker Image CD on: push: - branches: [ master ] + branches: [ main ] workflow_dispatch: jobs: diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml index 53470896..8b057418 100644 --- a/.github/workflows/docker-ci.yml +++ b/.github/workflows/docker-ci.yml @@ -2,7 +2,7 @@ name: Docker Image CI on: pull_request: - branches: [ master, dev ] + branches: [ main, dev ] workflow_dispatch: From f329a96dc3ff640654cb33ee3d9723273b5c773f Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Wed, 2 Nov 2022 13:50:46 -0400 Subject: [PATCH 5/7] trigger ci --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index d6c3f687..d52b4d08 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -12,5 +12,5 @@ Please include the Jira Ticket Number and Link for this issue/task. ## Workflow -Owner of the Pull Request will be responsible for merge after all requirements are met, including approval from at least one reviewer. Additional changes made after a review will dismiss any approvals and require re-review of the additional updates. Auto merging can be enabled below if additional changes are likely not to be needed. The bot will auto assign reviewers to your Pull Request for you. +Owner of the Pull Request will be responsible for merge after all requirements are met, including approval from at least one reviewer. Additional changes made after a review will dismiss any approvals and require re-review of the additional updates. Auto merging can be enabled below if additional changes are likely not to be needed. The bot will auto assign reviewers to your Pull Request for you. From a7eaddb4754c838e300e8d067c6da724e3c73266 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Wed, 2 Nov 2022 13:59:51 -0400 Subject: [PATCH 6/7] change action name --- .github/workflows/docker-cd-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-cd-dev.yml b/.github/workflows/docker-cd-dev.yml index 16c3bdc5..2f2aea9e 100644 --- a/.github/workflows/docker-cd-dev.yml +++ b/.github/workflows/docker-cd-dev.yml @@ -1,4 +1,4 @@ -name: Docker Image Development CD +name: Docker Development Image CD on: push: From 57165bc7017d615f63a72d502b53213393b60cbc Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Thu, 10 Nov 2022 14:48:24 -0500 Subject: [PATCH 7/7] pr template updates --- .github/pull_request_template.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index d52b4d08..f586c03d 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -10,6 +10,10 @@ Please include the Jira Ticket Number and Link for this issue/task. - [ ] I have performed a self-review of my code - [ ] Ensure the target / base branch for any feature PR is set to `dev` not main (the only exception to this is releases from `dev` and hotfix branches) +## Checklist for conducting a review +- [ ] Review the code changes and make sure they all make sense and are necessary. +- [ ] Pull the PR branch locally and test by running through workflow and making sure everything works as it is supposed to. + ## Workflow Owner of the Pull Request will be responsible for merge after all requirements are met, including approval from at least one reviewer. Additional changes made after a review will dismiss any approvals and require re-review of the additional updates. Auto merging can be enabled below if additional changes are likely not to be needed. The bot will auto assign reviewers to your Pull Request for you.