Skip to content

Commit

Permalink
[CI]: Apply the changes for linux-sampleapp-ci.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
satoshiotomakan committed Apr 24, 2024
1 parent 408c917 commit 3e38e65
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ concurrency:
jobs:
build:
runs-on: ubuntu-latest
# if: github.event.pull_request.draft == false
if: github.event.pull_request.draft == false
steps:
- uses: actions/checkout@v3
- name: Install system dependencies
Expand Down
13 changes: 2 additions & 11 deletions .github/workflows/linux-sampleapp-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,17 @@ jobs:
runs-on: ubuntu-latest
if: github.event.pull_request.draft == false
steps:
# Work around https://github.com/actions/runner-images/issues/8659
- name: Remove GCC 13 from runner image
shell: bash
run: |
# Work around https://github.com/actions/runner-images/issues/9733
sudo rm /etc/apt/sources.list.d/microsoft-prod.list
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=2.35-0ubuntu3.7 libc6-dev=2.35-0ubuntu3.7 libstdc++6=12.3.0-1ubuntu1~22.04 libgcc-s1=12.3.0-1ubuntu1~22.04
- uses: actions/checkout@v3
- name: Install system dependencies
run: |
tools/install-sys-dependencies-linux
tools/install-sys-dependencies-linux ci
tools/install-rust-dependencies
- name: Cache internal dependencies
id: internal_cache
uses: actions/cache@v3
with:
path: build/local
key: ${{ runner.os }}-internal-${{ hashFiles('tools/install-dependencies') }}
key: ${{ runner.os }}-internal-${{ hashFiles('tools/install-sys-dependencies-linux') }}-${{ hashFiles('tools/install-dependencies') }}
- name: Install internal dependencies
run: |
tools/install-dependencies
Expand Down
6 changes: 3 additions & 3 deletions tools/install-sys-dependencies-linux
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

set -e

# 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

# 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"
Expand All @@ -22,3 +19,6 @@ if [[ "$1" == "ci" ]]; then
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

0 comments on commit 3e38e65

Please sign in to comment.