From e9e020994c9ba282bc3a0ec9301f01a483c95554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Dan?= Date: Wed, 19 Jul 2023 10:33:48 +0200 Subject: [PATCH 1/6] ci: use reusable workflow --- .github/workflows/test:e2e.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test:e2e.yml b/.github/workflows/test:e2e.yml index 28ca17f..f87dab6 100644 --- a/.github/workflows/test:e2e.yml +++ b/.github/workflows/test:e2e.yml @@ -9,12 +9,6 @@ jobs: e2e: runs-on: ubuntu-latest steps: - - uses: convictional/trigger-workflow-and-wait@v1.6.1 + - uses: topos-protocol/e2e-tests/.github/frontend:erc20-messaging.yml@main with: - owner: topos-protocol - repo: e2e-tests - github_token: ${{ secrets.ROBOT_PAT_TRIGGER_E2E_WORKFLOWS }} - workflow_file_name: frontend:erc20-messaging.yml - ref: main - wait_interval: 60 - client_payload: '{ "local-erc20-messaging-infra-ref": "${{ github.head_ref }}" }' + local-erc20-messaging-infra-ref: "${{ github.head_ref }}" From 87f746c93d2e2074bf7dcc9aac2dd9ebb8e07d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Dan?= Date: Wed, 19 Jul 2023 10:34:36 +0200 Subject: [PATCH 2/6] chore: use larger runner --- .github/workflows/test:e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test:e2e.yml b/.github/workflows/test:e2e.yml index f87dab6..e40351a 100644 --- a/.github/workflows/test:e2e.yml +++ b/.github/workflows/test:e2e.yml @@ -7,7 +7,7 @@ on: jobs: e2e: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-16-core steps: - uses: topos-protocol/e2e-tests/.github/frontend:erc20-messaging.yml@main with: From e1e7d3bb324f8c5b13b3641603ad3f9cad6b4e8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Dan?= Date: Wed, 19 Jul 2023 10:36:03 +0200 Subject: [PATCH 3/6] fix: add missing workflows folder path --- .github/workflows/test:e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test:e2e.yml b/.github/workflows/test:e2e.yml index e40351a..60db046 100644 --- a/.github/workflows/test:e2e.yml +++ b/.github/workflows/test:e2e.yml @@ -9,6 +9,6 @@ jobs: e2e: runs-on: ubuntu-latest-16-core steps: - - uses: topos-protocol/e2e-tests/.github/frontend:erc20-messaging.yml@main + - uses: topos-protocol/e2e-tests/.github/workflows/frontend:erc20-messaging.yml@main with: local-erc20-messaging-infra-ref: "${{ github.head_ref }}" From d2387c83a69f8aa118477c0bdad0ad036abb9a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Dan?= Date: Wed, 19 Jul 2023 10:37:21 +0200 Subject: [PATCH 4/6] fix: use reusable workflow as job and not step --- .github/workflows/test:e2e.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test:e2e.yml b/.github/workflows/test:e2e.yml index 60db046..f0a71eb 100644 --- a/.github/workflows/test:e2e.yml +++ b/.github/workflows/test:e2e.yml @@ -7,8 +7,6 @@ on: jobs: e2e: - runs-on: ubuntu-latest-16-core - steps: - - uses: topos-protocol/e2e-tests/.github/workflows/frontend:erc20-messaging.yml@main - with: - local-erc20-messaging-infra-ref: "${{ github.head_ref }}" + - uses: topos-protocol/e2e-tests/.github/workflows/frontend:erc20-messaging.yml@main + with: + local-erc20-messaging-infra-ref: "${{ github.head_ref }}" From 117532d464f712ccc9969f3dc2626889c16c7364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Dan?= Date: Wed, 19 Jul 2023 10:39:37 +0200 Subject: [PATCH 5/6] fix: format yaml as it should --- .github/workflows/test:e2e.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test:e2e.yml b/.github/workflows/test:e2e.yml index f0a71eb..5462e8e 100644 --- a/.github/workflows/test:e2e.yml +++ b/.github/workflows/test:e2e.yml @@ -7,6 +7,6 @@ on: jobs: e2e: - - uses: topos-protocol/e2e-tests/.github/workflows/frontend:erc20-messaging.yml@main - with: - local-erc20-messaging-infra-ref: "${{ github.head_ref }}" + uses: topos-protocol/e2e-tests/.github/workflows/frontend:erc20-messaging.yml@main + with: + local-erc20-messaging-infra-ref: "${{ github.head_ref }}" From 429667acf01776b8d0d2c9aa28a6af44c5249706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Dan?= Date: Wed, 19 Jul 2023 10:43:33 +0200 Subject: [PATCH 6/6] chore: use other e2e-tests revision --- .github/workflows/test:e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test:e2e.yml b/.github/workflows/test:e2e.yml index 5462e8e..e4d6e32 100644 --- a/.github/workflows/test:e2e.yml +++ b/.github/workflows/test:e2e.yml @@ -7,6 +7,6 @@ on: jobs: e2e: - uses: topos-protocol/e2e-tests/.github/workflows/frontend:erc20-messaging.yml@main + uses: topos-protocol/e2e-tests/.github/workflows/frontend:erc20-messaging.yml@feat/make-workflows-reusuable with: local-erc20-messaging-infra-ref: "${{ github.head_ref }}"