This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/main by this push:
new cef6c4c6c ci: Fix the CI builds after Github Actions moving
ubuntu-latest to 24.04 (#3213)
cef6c4c6c is described below
commit cef6c4c6cbcc75e4b323e3a451d0a990debce8cb
Author: Martin Grigorov <[email protected]>
AuthorDate: Wed Oct 16 14:14:30 2024 +0300
ci: Fix the CI builds after Github Actions moving ubuntu-latest to 24.04
(#3213)
* ci: Fix the CI builds after Github Actions moving ubuntu-latest to 24.04
Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
* Try with libicu-dev instead of DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1
Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
* Revert the changes for CSharp. They could be taken care in a separate PR
Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
* Run C# tests on ubuntu-22.04 to fix the CI issues
Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
* Do not try to run tests for langs without build.sh (such as lang/rust/)
Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
---------
Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
---
.github/workflows/deploy-docs.yml | 6 ++++++
.github/workflows/test-lang-csharp-ARM.yml | 6 +++---
.github/workflows/test-lang-csharp.yml | 4 ++--
.github/workflows/test-lang-java.yml | 4 ++--
.github/workflows/test-lang-js.yml | 4 ++--
share/docker/Dockerfile | 6 ++----
share/docker/run-tests.sh | 8 +++++---
7 files changed, 22 insertions(+), 16 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..501a56b9c 100644
--- a/.github/workflows/test-lang-csharp-ARM.yml
+++ b/.github/workflows/test-lang-csharp-ARM.yml
@@ -34,7 +34,7 @@ concurrency:
jobs:
test:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
@@ -66,7 +66,7 @@ jobs:
run: ./build.sh test
interop:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
@@ -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
diff --git a/.github/workflows/test-lang-csharp.yml
b/.github/workflows/test-lang-csharp.yml
index 4efc70f3f..3e13e6877 100644
--- a/.github/workflows/test-lang-csharp.yml
+++ b/.github/workflows/test-lang-csharp.yml
@@ -34,7 +34,7 @@ concurrency:
jobs:
test:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
@@ -66,7 +66,7 @@ jobs:
run: ./build.sh test
interop:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
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 \
diff --git a/share/docker/run-tests.sh b/share/docker/run-tests.sh
index a585a4136..74696653d 100755
--- a/share/docker/run-tests.sh
+++ b/share/docker/run-tests.sh
@@ -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
