This is an automated email from the ASF dual-hosted git repository. mgrigorov pushed a commit to branch drop-pypy3.9 in repository https://gitbox.apache.org/repos/asf/avro.git
commit 754a31eff6935f3199f0d5a3882c35904bd2a6ec Author: Martin Tzvetanov Grigorov <[email protected]> AuthorDate: Wed Oct 16 10:31:18 2024 +0300 ci: Fix the CI builds after Github Actions moving ubuntu-latest to 24.04 Signed-off-by: Martin Tzvetanov Grigorov <[email protected]> --- .github/workflows/deploy-docs.yml | 6 ++++++ .github/workflows/test-lang-csharp-ARM.yml | 8 ++++++-- .github/workflows/test-lang-csharp.yml | 8 ++++++-- .github/workflows/test-lang-java.yml | 4 ++-- .github/workflows/test-lang-js.yml | 4 ++-- share/docker/Dockerfile | 6 ++---- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 82dcc5d8b..35be06e9d 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -203,6 +203,12 @@ jobs: with: fetch-depth: 0 + - name: Install dependencies + run: | + set -x + sudo apt-get update -q + sudo apt-get install -q -y subversion + - name: Download website uses: actions/download-artifact@v4 with: diff --git a/.github/workflows/test-lang-csharp-ARM.yml b/.github/workflows/test-lang-csharp-ARM.yml index f7ad049fd..4dcb496f8 100644 --- a/.github/workflows/test-lang-csharp-ARM.yml +++ b/.github/workflows/test-lang-csharp-ARM.yml @@ -63,7 +63,9 @@ jobs: run: ./build.sh lint - name: Test - run: ./build.sh test + run: | + export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 + ./build.sh test interop: runs-on: ubuntu-latest @@ -123,7 +125,9 @@ jobs: run: ./build.sh interop-data-generate - name: Run Interop Tests - run: ./build.sh interop-data-test + run: | + export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 + ./build.sh interop-data-test arm64: name: C# on Linux ARM64 diff --git a/.github/workflows/test-lang-csharp.yml b/.github/workflows/test-lang-csharp.yml index 4efc70f3f..b7d0a76c9 100644 --- a/.github/workflows/test-lang-csharp.yml +++ b/.github/workflows/test-lang-csharp.yml @@ -63,7 +63,9 @@ jobs: run: ./build.sh lint - name: Test - run: ./build.sh test + run: | + export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 + ./build.sh test interop: runs-on: ubuntu-latest @@ -123,4 +125,6 @@ jobs: run: ./build.sh interop-data-generate - name: Run Interop Tests - run: ./build.sh interop-data-test + run: | + export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 + ./build.sh interop-data-test diff --git a/.github/workflows/test-lang-java.yml b/.github/workflows/test-lang-java.yml index bb4276057..fd0ed28f1 100644 --- a/.github/workflows/test-lang-java.yml +++ b/.github/workflows/test-lang-java.yml @@ -122,8 +122,8 @@ jobs: - name: 'Install Python Dependencies' run: | - python3 -m pip install --upgrade pip setuptools tox - python3 -m pip install python-snappy zstandard + python3 -m pip install --break-system-packages --upgrade pip setuptools tox + python3 -m pip install --break-system-packages python-snappy zstandard - name: 'Setup C# for Generating Interop Data' uses: actions/setup-dotnet@v4 diff --git a/.github/workflows/test-lang-js.yml b/.github/workflows/test-lang-js.yml index 20f2cc09f..60b06ddeb 100644 --- a/.github/workflows/test-lang-js.yml +++ b/.github/workflows/test-lang-js.yml @@ -96,8 +96,8 @@ jobs: libzstd-dev - name: Install Python Dependencies run: | - python3 -m pip install --upgrade pip setuptools tox - python3 -m pip install python-snappy zstandard + python3 -m pip install --break-system-packages --upgrade pip setuptools tox + python3 -m pip install --break-system-packages python-snappy zstandard - name: Create Interop Data Directory working-directory: . diff --git a/share/docker/Dockerfile b/share/docker/Dockerfile index 66972b168..6c1d7127b 100644 --- a/share/docker/Dockerfile +++ b/share/docker/Dockerfile @@ -191,7 +191,7 @@ RUN curl -sSL https://cpanmin.us \ && rm -rf .cpanm # Install Python3 -ENV PATH="${PATH}:/opt/pypy3.9/bin:/opt/pypy3.10/bin" \ +ENV PATH="${PATH}:/opt/pypy3.10/bin" \ PIP_NO_CACHE_DIR=off # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope @@ -201,11 +201,9 @@ RUN case "${BUILDARCH:?}" in \ *) pypyarch=linux64;; \ esac \ && cd /opt \ - && for url in https://downloads.python.org/pypy/pypy3.9-v7.3.12-"$pypyarch".tar.bz2 \ - https://downloads.python.org/pypy/pypy3.10-v7.3.12-"$pypyarch".tar.bz2; \ + && for url in https://downloads.python.org/pypy/pypy3.10-v7.3.12-"$pypyarch".tar.bz2; \ do curl -fsSL "$url" | tar -xvjpf -; \ done \ - && ln -s pypy3.9* pypy3.9 \ && ln -s pypy3.10* pypy3.10 RUN python3 -m pip install --upgrade pip setuptools wheel \
