From d4770ae403ebe5e417bde8cb33c15d3bc40072a9 Mon Sep 17 00:00:00 2001 From: pk910 Date: Wed, 15 May 2024 09:34:41 +0200 Subject: [PATCH 1/7] add debug output --- .github/workflows/per-pr.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/per-pr.yml b/.github/workflows/per-pr.yml index c3fb4438b..d5c0223dc 100644 --- a/.github/workflows/per-pr.yml +++ b/.github/workflows/per-pr.yml @@ -76,6 +76,10 @@ jobs: shell: bash run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT id: extract_branch + - name: Dump GitHub context + env: + GITHUB_CONTEXT: ${{ toJSON(github) }} + run: echo "$GITHUB_CONTEXT" - name: Kurtosis Assertoor GitHub Action uses: ethpandaops/kurtosis-assertoor-github-action@v1 with: From 17844feb99a57316d05e7bd99ca29e27938f8eab Mon Sep 17 00:00:00 2001 From: pk910 Date: Wed, 15 May 2024 09:54:26 +0200 Subject: [PATCH 2/7] fix --- .github/workflows/per-pr.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/per-pr.yml b/.github/workflows/per-pr.yml index d5c0223dc..9ae51a217 100644 --- a/.github/workflows/per-pr.yml +++ b/.github/workflows/per-pr.yml @@ -72,16 +72,15 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v4 - - name: Extract branch name + - name: Extract package & branch name shell: bash - run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT + run: | + echo "package=${{ github.event.pull_request.head.repo.html_url }}" >> $GITHUB_OUTPUT + echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT id: extract_branch - - name: Dump GitHub context - env: - GITHUB_CONTEXT: ${{ toJSON(github) }} - run: echo "$GITHUB_CONTEXT" - name: Kurtosis Assertoor GitHub Action uses: ethpandaops/kurtosis-assertoor-github-action@v1 with: + ethereum_package_url: ${{ steps.extract_branch.outputs.package }} ethereum_package_branch: ${{ steps.extract_branch.outputs.branch }} ethereum_package_args: .github/tests/mix-assert.yaml From 49ffb2206589d1f99edac456761b619c118ec54e Mon Sep 17 00:00:00 2001 From: pk910 Date: Wed, 15 May 2024 09:57:14 +0200 Subject: [PATCH 3/7] fix --- .github/workflows/per-pr.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/per-pr.yml b/.github/workflows/per-pr.yml index 9ae51a217..7ad4020ae 100644 --- a/.github/workflows/per-pr.yml +++ b/.github/workflows/per-pr.yml @@ -75,7 +75,8 @@ jobs: - name: Extract package & branch name shell: bash run: | - echo "package=${{ github.event.pull_request.head.repo.html_url }}" >> $GITHUB_OUTPUT + package_url="${{ github.event.pull_request.head.repo.html_url }}" + echo "package=$(echo "$package_url" | sed -E 's/^\s*.*:\/\///g')" >> $GITHUB_OUTPUT echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT id: extract_branch - name: Kurtosis Assertoor GitHub Action From 9b3e20403840b8faf80ecb3c3f24ed92b899e505 Mon Sep 17 00:00:00 2001 From: pk910 Date: Wed, 15 May 2024 10:02:44 +0200 Subject: [PATCH 4/7] fix --- .github/workflows/per-pr.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/per-pr.yml b/.github/workflows/per-pr.yml index 7ad4020ae..1f3a44866 100644 --- a/.github/workflows/per-pr.yml +++ b/.github/workflows/per-pr.yml @@ -75,13 +75,10 @@ jobs: - name: Extract package & branch name shell: bash run: | - package_url="${{ github.event.pull_request.head.repo.html_url }}" - echo "package=$(echo "$package_url" | sed -E 's/^\s*.*:\/\///g')" >> $GITHUB_OUTPUT - echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT + echo "branch=refs/pull/${{ github.ref_name }}" >> $GITHUB_OUTPUT id: extract_branch - name: Kurtosis Assertoor GitHub Action uses: ethpandaops/kurtosis-assertoor-github-action@v1 with: - ethereum_package_url: ${{ steps.extract_branch.outputs.package }} ethereum_package_branch: ${{ steps.extract_branch.outputs.branch }} ethereum_package_args: .github/tests/mix-assert.yaml From 676705a966f67463dd51e60207bf142897a7cbd9 Mon Sep 17 00:00:00 2001 From: pk910 Date: Wed, 15 May 2024 10:06:08 +0200 Subject: [PATCH 5/7] fix --- .github/workflows/per-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/per-pr.yml b/.github/workflows/per-pr.yml index 1f3a44866..fb0aabfca 100644 --- a/.github/workflows/per-pr.yml +++ b/.github/workflows/per-pr.yml @@ -75,7 +75,7 @@ jobs: - name: Extract package & branch name shell: bash run: | - echo "branch=refs/pull/${{ github.ref_name }}" >> $GITHUB_OUTPUT + echo "branch=${{ github.sha }}" >> $GITHUB_OUTPUT id: extract_branch - name: Kurtosis Assertoor GitHub Action uses: ethpandaops/kurtosis-assertoor-github-action@v1 From 01092c4379745ae7a052dd34a19a7e86c81f9829 Mon Sep 17 00:00:00 2001 From: pk910 Date: Wed, 15 May 2024 20:19:01 +0200 Subject: [PATCH 6/7] fix --- .github/workflows/per-pr.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/per-pr.yml b/.github/workflows/per-pr.yml index fb0aabfca..1999e0338 100644 --- a/.github/workflows/per-pr.yml +++ b/.github/workflows/per-pr.yml @@ -72,13 +72,8 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v4 - - name: Extract package & branch name - shell: bash - run: | - echo "branch=${{ github.sha }}" >> $GITHUB_OUTPUT - id: extract_branch - name: Kurtosis Assertoor GitHub Action uses: ethpandaops/kurtosis-assertoor-github-action@v1 with: - ethereum_package_branch: ${{ steps.extract_branch.outputs.branch }} + ethereum_package_url: "." ethereum_package_args: .github/tests/mix-assert.yaml From 216836ee3aaef245b817a9895e99a8eef046e227 Mon Sep 17 00:00:00 2001 From: pk910 Date: Wed, 15 May 2024 20:34:27 +0200 Subject: [PATCH 7/7] fix --- .github/workflows/per-pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/per-pr.yml b/.github/workflows/per-pr.yml index 1999e0338..b81dc5603 100644 --- a/.github/workflows/per-pr.yml +++ b/.github/workflows/per-pr.yml @@ -76,4 +76,5 @@ jobs: uses: ethpandaops/kurtosis-assertoor-github-action@v1 with: ethereum_package_url: "." + ethereum_package_branch: "" ethereum_package_args: .github/tests/mix-assert.yaml