Skip to content

Commit

Permalink
[Chore]: Linux CI upgrade to Ubuntu 24.04 (trustwallet#4062)
Browse files Browse the repository at this point in the history
* Fix Linux CI

* Try to install any libc and libstd versions

* Try to use `mjp41/workaround8649` package

* Try to use `mjp41/workaround8649` package

* Use ubuntu-22.04

* Try to disable the temporary fix for ubuntu-latest

* Downgrade lcov to 1.15

* Downgrade lcov to 1.15-1

* Downgrade lcov to 1.15-1

* Disable derive_function_end_line setting

* Install lcov 1.15-1 manually

* Install lcov 1.15-1 manually

* Install lcov 1.15-1 manually

* Install lcov 1.15-1 manually

* Minor changes

* [CI] Trigger CI

* Update emsdk to 3.1.33

* Install gcc-multilib

* Revert wasm-ci.yml
  • Loading branch information
satoshiotomakan authored Oct 15, 2024
1 parent cd6869b commit aaa2e51
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v3
- name: Install system dependencies
run: |
tools/install-sys-dependencies-linux ci
tools/install-sys-dependencies-linux
tools/install-rust-dependencies
- name: Cache internal dependencies
id: internal_cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux-sampleapp-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v3
- name: Install system dependencies
run: |
tools/install-sys-dependencies-linux ci
tools/install-sys-dependencies-linux
tools/install-rust-dependencies
- name: Cache internal dependencies
id: internal_cache
Expand Down
2 changes: 1 addition & 1 deletion codegen/lib/code_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def render_kotlin_jni_c
def render(file, locals = {})
@locals = locals
path = File.expand_path(file, File.join(File.dirname(__FILE__), 'templates'))
template = ERB.new(File.read(path), nil, '-')
template = ERB.new(File.read(path), trim_mode: '-')
template.result(binding)
end

Expand Down
28 changes: 9 additions & 19 deletions tools/install-sys-dependencies-linux
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,13 @@

set -e

# Downgrade libc to temporarily fix https://github.com/actions/runner-images/issues/8659
if [[ "$1" == "ci" ]]; then
LIBSTD_PACKAGE_VERSION="12.3.0-1ubuntu1~22.04"
# Bump this version if the CI has been broken due to the packages update.
LIBC_PACKAGE_VERSION="2.35-0ubuntu3.8"

echo "Remove GCC 13 from runner image - runner-images/8659 workaround"
echo "NOTE: Bump $LIBC_PACKAGE_VERSION version if the CI has been broken due to the packages update"

sudo rm -f /etc/apt/sources.list.d/ubuntu-toolchain-r-ubuntu-test-jammy.list
sudo apt-get update
sudo apt-get install -y --allow-downgrades \
libc6=$LIBC_PACKAGE_VERSION \
libc6-dev=$LIBC_PACKAGE_VERSION \
libstdc++6=$LIBSTD_PACKAGE_VERSION \
libgcc-s1=$LIBSTD_PACKAGE_VERSION
fi

# build-essential clang-14 libc++-dev libc++abi-dev ruby-full cmake
sudo apt-get update && sudo apt-get install ninja-build lcov llvm-14 clang-tidy-14 libboost-all-dev rustc --fix-missing
sudo apt-get update && sudo apt-get install ninja-build llvm-14 clang-tidy-14 libboost-all-dev rustc --fix-missing gcc-multilib g++-multilib

# As of now, Ubuntu 24.04 has lcov 2.0-4ubuntu2 only, but we don't support it yet.
# Install lcov 1.15-1 manually.
LCOV_TEMP="$(mktemp -d)"
LCOV_DEB="$LCOV_TEMP/lcov.deb"
wget -O "$LCOV_DEB" http://mirrors.kernel.org/ubuntu/pool/universe/l/lcov/lcov_1.15-1_all.deb
sudo apt-get install "$LCOV_DEB"
rm -rf $LCOV_TEMP
2 changes: 1 addition & 1 deletion tools/install-wasm-dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e

emsdk_version=3.1.30
emsdk_version=3.1.33

git clone https://github.com/emscripten-core/emsdk.git

Expand Down

0 comments on commit aaa2e51

Please sign in to comment.