From 897274f869a3ae09e2c7dc4d95b7b469ed84a278 Mon Sep 17 00:00:00 2001 From: filip Date: Mon, 7 Nov 2022 22:56:04 +0100 Subject: [PATCH 1/5] edit condition --- .github/workflows/contracts-e2e-tests-and-deploy.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/contracts-e2e-tests-and-deploy.yaml b/.github/workflows/contracts-e2e-tests-and-deploy.yaml index 86ab4c3ef8..42c0163291 100644 --- a/.github/workflows/contracts-e2e-tests-and-deploy.yaml +++ b/.github/workflows/contracts-e2e-tests-and-deploy.yaml @@ -136,7 +136,7 @@ jobs: build_and_deploy_contracts: name: Deploy contracts on feature environment - if: github.event_name == 'push' && github.ref_name == 'benjamin' + if: ${{ (github.event_name == 'push') && (github.ref == 'refs/heads/edit-workflow-condition') }} needs: [run-tests] runs-on: ubuntu-20.04 steps: @@ -299,4 +299,3 @@ jobs: -H "Accept: application/vnd.github+json" \ -H 'Authorization: Bearer ${{ secrets.CI_GH_TOKEN }}' \ -d '{ "ref":"main", "inputs": { "buildImage": "false", "deployImage": "true" }}' - From 171dd3174bed3a03369c5d5f088d3bcebe24b112 Mon Sep 17 00:00:00 2001 From: filip Date: Mon, 7 Nov 2022 22:58:14 +0100 Subject: [PATCH 2/5] testit --- .github/workflows/contracts-e2e-tests-and-deploy.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/contracts-e2e-tests-and-deploy.yaml b/.github/workflows/contracts-e2e-tests-and-deploy.yaml index 42c0163291..35f7d20103 100644 --- a/.github/workflows/contracts-e2e-tests-and-deploy.yaml +++ b/.github/workflows/contracts-e2e-tests-and-deploy.yaml @@ -10,9 +10,9 @@ on: - 'contracts/**' - '.github/**' -concurrency: - group: ${{ github.workflow }} - cancel-in-progress: true +# concurrency: +# group: ${{ github.workflow }} +# cancel-in-progress: false env: CHECKOUT_BRANCH: benjamin From 9ad488d410dc4b666842bdc83a040148d74ab706 Mon Sep 17 00:00:00 2001 From: filip Date: Mon, 7 Nov 2022 23:08:23 +0100 Subject: [PATCH 3/5] trigger it --- .github/workflows/contracts-e2e-tests-and-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/contracts-e2e-tests-and-deploy.yaml b/.github/workflows/contracts-e2e-tests-and-deploy.yaml index 35f7d20103..a98e3ca776 100644 --- a/.github/workflows/contracts-e2e-tests-and-deploy.yaml +++ b/.github/workflows/contracts-e2e-tests-and-deploy.yaml @@ -137,7 +137,7 @@ jobs: build_and_deploy_contracts: name: Deploy contracts on feature environment if: ${{ (github.event_name == 'push') && (github.ref == 'refs/heads/edit-workflow-condition') }} - needs: [run-tests] + # needs: [run-tests] runs-on: ubuntu-20.04 steps: - name: Checkout repo From 9ee789a78a5deb0d2ad0223bc3a552402a8f7aec Mon Sep 17 00:00:00 2001 From: filip Date: Mon, 7 Nov 2022 23:57:45 +0100 Subject: [PATCH 4/5] cleanup --- .github/workflows/contracts-e2e-tests-and-deploy.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/contracts-e2e-tests-and-deploy.yaml b/.github/workflows/contracts-e2e-tests-and-deploy.yaml index a98e3ca776..97520ee3c4 100644 --- a/.github/workflows/contracts-e2e-tests-and-deploy.yaml +++ b/.github/workflows/contracts-e2e-tests-and-deploy.yaml @@ -10,9 +10,9 @@ on: - 'contracts/**' - '.github/**' -# concurrency: -# group: ${{ github.workflow }} -# cancel-in-progress: false +concurrency: + group: ${{ github.workflow }} + cancel-in-progress: false env: CHECKOUT_BRANCH: benjamin @@ -137,7 +137,7 @@ jobs: build_and_deploy_contracts: name: Deploy contracts on feature environment if: ${{ (github.event_name == 'push') && (github.ref == 'refs/heads/edit-workflow-condition') }} - # needs: [run-tests] + needs: [run-tests] runs-on: ubuntu-20.04 steps: - name: Checkout repo From eaaf7269a9bfddabf5d65c56e1bce764ac36bfd6 Mon Sep 17 00:00:00 2001 From: filip Date: Tue, 8 Nov 2022 00:00:18 +0100 Subject: [PATCH 5/5] cleanup --- .github/workflows/contracts-e2e-tests-and-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/contracts-e2e-tests-and-deploy.yaml b/.github/workflows/contracts-e2e-tests-and-deploy.yaml index 97520ee3c4..671bdb7b73 100644 --- a/.github/workflows/contracts-e2e-tests-and-deploy.yaml +++ b/.github/workflows/contracts-e2e-tests-and-deploy.yaml @@ -136,7 +136,7 @@ jobs: build_and_deploy_contracts: name: Deploy contracts on feature environment - if: ${{ (github.event_name == 'push') && (github.ref == 'refs/heads/edit-workflow-condition') }} + if: ${{ (github.event_name == 'push') && (github.ref == 'refs/heads/benjamin') }} needs: [run-tests] runs-on: ubuntu-20.04 steps: