From 6cd17bff9d9a90c86617d2992143443ced52d20a Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 12 Oct 2023 21:40:31 -0600 Subject: [PATCH 1/4] Workaround for missing Python binaries for ARM --- .gitea/workflows/fixturenet-eth-test.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/fixturenet-eth-test.yml b/.gitea/workflows/fixturenet-eth-test.yml index 8d0d8da1..73804df5 100644 --- a/.gitea/workflows/fixturenet-eth-test.yml +++ b/.gitea/workflows/fixturenet-eth-test.yml @@ -19,7 +19,15 @@ jobs: steps: - name: "Clone project repository" uses: actions/checkout@v3 - - name: "Install Python" + # At present the stock setup-python action fails on Linux/aarch64 + # Conditional steps below workaroud this by using deadsnakes for that case only + - name: "Install Python for ARM on Linux" + if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }} + uses: deadsnakes/action@v3.0.1 + with: + python-version: '3.8' + - name: "Install Python cases other than ARM on Linux" + if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }} uses: actions/setup-python@v4 with: python-version: '3.8' -- 2.45.2 From 648e1a0ccf097b1e12ca1ab7de04f3f5228ce778 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 12 Oct 2023 21:43:02 -0600 Subject: [PATCH 2/4] Trigger CI job --- .gitea/workflows/triggers/fixturenet-eth-test | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/triggers/fixturenet-eth-test b/.gitea/workflows/triggers/fixturenet-eth-test index c95c9a8d..3f21cb75 100644 --- a/.gitea/workflows/triggers/fixturenet-eth-test +++ b/.gitea/workflows/triggers/fixturenet-eth-test @@ -1 +1,2 @@ Change this file to trigger running the fixturenet-eth-test CI job +trigger me -- 2.45.2 From 2984f8846b99f7d53e7feb190dec14262289d3b0 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 12 Oct 2023 21:47:39 -0600 Subject: [PATCH 3/4] Add Python install workaround to remaining jobs --- .gitea/workflows/fixturenet-eth-plugeth-test.yml | 12 ++++++++++-- .gitea/workflows/publish.yml | 10 +++++++++- .gitea/workflows/test-deploy.yml | 10 +++++++++- .gitea/workflows/test.yml | 10 +++++++++- .gitea/workflows/triggers/fixturenet-eth-test | 2 +- 5 files changed, 38 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/fixturenet-eth-plugeth-test.yml b/.gitea/workflows/fixturenet-eth-plugeth-test.yml index 027266f1..739e33b0 100644 --- a/.gitea/workflows/fixturenet-eth-plugeth-test.yml +++ b/.gitea/workflows/fixturenet-eth-plugeth-test.yml @@ -19,8 +19,16 @@ jobs: steps: - name: "Clone project repository" uses: actions/checkout@v3 - - name: "Install Python" - uses: cerc-io/setup-python@v4 + # At present the stock setup-python action fails on Linux/aarch64 + # Conditional steps below workaroud this by using deadsnakes for that case only + - name: "Install Python for ARM on Linux" + if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }} + uses: deadsnakes/action@v3.0.1 + with: + python-version: '3.8' + - name: "Install Python cases other than ARM on Linux" + if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }} + uses: actions/setup-python@v4 with: python-version: '3.8' - name: "Print Python version" diff --git a/.gitea/workflows/publish.yml b/.gitea/workflows/publish.yml index 973210fa..ffbb9937 100644 --- a/.gitea/workflows/publish.yml +++ b/.gitea/workflows/publish.yml @@ -20,7 +20,15 @@ jobs: run: | build_tag=$(./scripts/create_build_tag_file.sh) echo "build-tag=v${build_tag}" >> $GITHUB_OUTPUT - - name: "Install Python" + # At present the stock setup-python action fails on Linux/aarch64 + # Conditional steps below workaroud this by using deadsnakes for that case only + - name: "Install Python for ARM on Linux" + if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }} + uses: deadsnakes/action@v3.0.1 + with: + python-version: '3.8' + - name: "Install Python cases other than ARM on Linux" + if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }} uses: actions/setup-python@v4 with: python-version: '3.8' diff --git a/.gitea/workflows/test-deploy.yml b/.gitea/workflows/test-deploy.yml index 66c017aa..6e47c82d 100644 --- a/.gitea/workflows/test-deploy.yml +++ b/.gitea/workflows/test-deploy.yml @@ -21,7 +21,15 @@ jobs: steps: - name: "Clone project repository" uses: actions/checkout@v3 - - name: "Install Python" + # At present the stock setup-python action fails on Linux/aarch64 + # Conditional steps below workaroud this by using deadsnakes for that case only + - name: "Install Python for ARM on Linux" + if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }} + uses: deadsnakes/action@v3.0.1 + with: + python-version: '3.8' + - name: "Install Python cases other than ARM on Linux" + if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }} uses: actions/setup-python@v4 with: python-version: '3.8' diff --git a/.gitea/workflows/test.yml b/.gitea/workflows/test.yml index 830b7c20..0ba1fab4 100644 --- a/.gitea/workflows/test.yml +++ b/.gitea/workflows/test.yml @@ -21,7 +21,15 @@ jobs: steps: - name: "Clone project repository" uses: actions/checkout@v3 - - name: "Install Python" + # At present the stock setup-python action fails on Linux/aarch64 + # Conditional steps below workaroud this by using deadsnakes for that case only + - name: "Install Python for ARM on Linux" + if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }} + uses: deadsnakes/action@v3.0.1 + with: + python-version: '3.8' + - name: "Install Python cases other than ARM on Linux" + if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }} uses: actions/setup-python@v4 with: python-version: '3.8' diff --git a/.gitea/workflows/triggers/fixturenet-eth-test b/.gitea/workflows/triggers/fixturenet-eth-test index 3f21cb75..7d12834e 100644 --- a/.gitea/workflows/triggers/fixturenet-eth-test +++ b/.gitea/workflows/triggers/fixturenet-eth-test @@ -1,2 +1,2 @@ Change this file to trigger running the fixturenet-eth-test CI job -trigger me + -- 2.45.2 From 8dc95836e11943bc69313ce8b92e41f257abe435 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 12 Oct 2023 21:53:09 -0600 Subject: [PATCH 4/4] Typo --- .gitea/workflows/triggers/fixturenet-eth-test | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/triggers/fixturenet-eth-test b/.gitea/workflows/triggers/fixturenet-eth-test index 7d12834e..c95c9a8d 100644 --- a/.gitea/workflows/triggers/fixturenet-eth-test +++ b/.gitea/workflows/triggers/fixturenet-eth-test @@ -1,2 +1 @@ Change this file to trigger running the fixturenet-eth-test CI job - -- 2.45.2