From a7e71818bbb6c5f01aa58bb4e3ddacadea2ad145 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Thu, 29 Jun 2023 10:35:26 -0700 Subject: [PATCH 1/7] Update deploy-pm4.yml --- .github/workflows/deploy-pm4.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 7e54343201..9c4c9489c2 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -16,7 +16,7 @@ on: env: SHA: ${{github.event.pull_request.head.sha}} PROJECT: ${{github.event.pull_request.head.repo.name}} - BODY: ${{github.event.pull_request.body}} + CI_PR_BODY: ${{github.event.pull_request.body}} PACKAGE_URL: ${{github.event.pull_request.head.repo.ssh_url}} PACKAGE_BRANCH: ${{github.event.pull_request.head.ref}} #MY_GITHUB_TOKEN: ${{ secrets.GH_STATUS_TOKEN }} @@ -46,8 +46,7 @@ jobs: echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV #Additional - echo "CI_PR_BODY=1" >> $GITHUB_ENV - echo "CACHEBUSTER=abc" >> $GITHUB_ENV + echo "CACHEBUSTER="$(date +%s) >> $GITHUB_ENV - name: Clone Repo STM run: | git clone --depth 1 -b cicd "https://$GITHUB_TOKEN@github.com/ProcessMaker/pm4-stm-docker.git" pm4-stm-docker From f860fbeeff3292cc55890cd24d60e7c634219a6c Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Thu, 29 Jun 2023 11:29:57 -0700 Subject: [PATCH 2/7] Update deploy-pm4.yml --- .github/workflows/deploy-pm4.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 9c4c9489c2..41fc4993cd 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -35,6 +35,9 @@ env: IMAGE_TAG1: $(echo "$CI_PROJECT-$CI_PACKAGE_BRANCH" | sed "s;/;-;g") GITHUB_COMMENT: ${{ secrets.GH_COMMENT }} pull_req_id: ${{github.event.pull_request.number}} +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true jobs: job1: name: build-stm-image From 0278637ce18a8abd50de072218108907e58370cd Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Thu, 29 Jun 2023 11:58:55 -0700 Subject: [PATCH 3/7] Update deploy-pm4.yml --- .github/workflows/deploy-pm4.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 41fc4993cd..890f3c591d 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -45,6 +45,7 @@ jobs: steps: - name: Export Params run: | + echo "Env Check: CI_PROJECT: $CI_PROJECT CI_PACKAGE_BRANCH: $CI_PACKAGE_BRANCH CI_PR_BODY: $CI_PR_BODY" echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV echo "IMAGE=${{env.aws-url}}/enterprise:${{env.IMAGE_TAG1}}" >> $GITHUB_ENV @@ -81,6 +82,7 @@ jobs: steps: - name: Export Params run: | + echo "Env Check: CI_PROJECT: $CI_PROJECT CI_PACKAGE_BRANCH: $CI_PACKAGE_BRANCH CI_PR_BODY: $CI_PR_BODY" echo "REPOSITORY=${{env.aws-url}}/enterprise" >> $GITHUB_ENV echo "TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV echo "IMAGE_TAG=${{env.IMAGE_TAG1}}" >> $GITHUB_ENV From 6a33c04320739f139c9ca0413ecb26ea26a53bed Mon Sep 17 00:00:00 2001 From: mavalosn Date: Thu, 29 Jun 2023 15:00:52 -0400 Subject: [PATCH 4/7] Validate CircleCI --- .github/workflows/deploy-pm4.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 890f3c591d..91aaaa3ccf 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -40,7 +40,7 @@ concurrency: cancel-in-progress: true jobs: job1: - name: build-stm-image + name: build-stm-image runs-on: ubuntu-22.04 steps: - name: Export Params From b8bf1b5b6492644a9ddddee1db312e53bf582848 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Fri, 30 Jun 2023 08:57:02 -0700 Subject: [PATCH 5/7] Remove call to docker stop --- .github/workflows/deploy-pm4.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index 91aaaa3ccf..bd980574fe 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -67,7 +67,6 @@ jobs: - name: Build and Push the image to ECR run: | cd pm4-stm-docker - docker stop $(docker ps -a -q) || true docker container prune -f docker-compose down -v docker-compose build processmaker From 6b36cc7f4d77a437fad4d4aacdc02b725f3b885b Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Fri, 30 Jun 2023 10:20:34 -0700 Subject: [PATCH 6/7] Also run for closed --- .github/workflows/deploy-pm4.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index bd980574fe..ce6d17c766 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -4,7 +4,7 @@ on: # branches: # - kr-github-actions pull_request: - types: [opened, reopened, synchronize, edited] + types: [opened, reopened, synchronize, edited, closed] #schedule: # - cron: '0 0 * * *' # every day at midnight #workflow_dispatch: From afeb630634227fec7b7cac771aecb9f0356bc5a6 Mon Sep 17 00:00:00 2001 From: Nolan Ehrstrom Date: Fri, 30 Jun 2023 12:04:06 -0700 Subject: [PATCH 7/7] Update deploy-pm4.yml --- .github/workflows/deploy-pm4.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml index ce6d17c766..8bdde138c9 100644 --- a/.github/workflows/deploy-pm4.yml +++ b/.github/workflows/deploy-pm4.yml @@ -41,6 +41,7 @@ concurrency: jobs: job1: name: build-stm-image + if: github.event.action != 'closed' runs-on: ubuntu-22.04 steps: - name: Export Params @@ -73,6 +74,7 @@ jobs: docker push ${IMAGE} job2: name: deploy-stm + if: github.event.action != 'closed' needs: job1 runs-on: ubuntu-22.04 container: @@ -120,6 +122,7 @@ jobs: bash ./github_comment.sh "$PROJECT" "$pull_req_id" job3: name: run-phpunit + if: github.event.action != 'closed' needs: job1 runs-on: ubuntu-22.04 steps: