Skip to content

Commit

Permalink
ci: Fix the CI builds after Github Actions moving ubuntu-latest to 24.04
Browse files Browse the repository at this point in the history
Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
  • Loading branch information
martin-g committed Oct 16, 2024
1 parent 8baf9de commit 754a31e
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 12 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
8 changes: 6 additions & 2 deletions .github/workflows/test-lang-csharp-ARM.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/test-lang-csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
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

0 comments on commit 754a31e

Please sign in to comment.