Skip to content

Commit

Permalink
ci: Fix the CI builds after Github Actions moving ubuntu-latest to 24…
Browse files Browse the repository at this point in the history
….04 (#3213)

* ci: Fix the CI builds after Github Actions moving ubuntu-latest to 24.04

Signed-off-by: Martin Tzvetanov Grigorov <mgrigorov@apache.org>

* Try with libicu-dev instead of DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1

Signed-off-by: Martin Tzvetanov Grigorov <mgrigorov@apache.org>

* Revert the changes for CSharp. They could be taken care in a separate PR

Signed-off-by: Martin Tzvetanov Grigorov <mgrigorov@apache.org>

* Run C# tests on ubuntu-22.04 to fix the CI issues

Signed-off-by: Martin Tzvetanov Grigorov <mgrigorov@apache.org>

* Do not try to run tests for langs without build.sh (such as lang/rust/)

Signed-off-by: Martin Tzvetanov Grigorov <mgrigorov@apache.org>

---------

Signed-off-by: Martin Tzvetanov Grigorov <mgrigorov@apache.org>
  • Loading branch information
martin-g authored Oct 16, 2024
1 parent 290ce8e commit cef6c4c
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 16 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-lang-csharp-ARM.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ concurrency:

jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
run: ./build.sh test

interop:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get update -q
sudo apt-get install -q -y wget libzstd-dev libicu-dev
sudo apt-get install -q -y wget libzstd-dev
wget https://dot.net/v1/dotnet-install.sh
bash ./dotnet-install.sh --channel "3.1" --install-dir "$HOME/.dotnet" # 3.1
bash ./dotnet-install.sh --channel "5.0" --install-dir "$HOME/.dotnet" # 5.0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-lang-csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ concurrency:

jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
run: ./build.sh test

interop:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-lang-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-lang-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: .
Expand Down
6 changes: 2 additions & 4 deletions share/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand Down
8 changes: 5 additions & 3 deletions share/docker/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ set -e

for lang in /avro/lang/*/
do
headline "Run tests: $lang"
cd "$lang"
./build.sh lint test
if [ -f "${lang}/build.sh" ]; then
headline "Run tests: $lang"
cd "$lang"
./build.sh lint test
fi
done

0 comments on commit cef6c4c

Please sign in to comment.