diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index a8d15b2d3d6..89424cd4081 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -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 diff --git a/.github/workflows/linux-sampleapp-ci.yml b/.github/workflows/linux-sampleapp-ci.yml index da1aa11656b..e67011507cd 100644 --- a/.github/workflows/linux-sampleapp-ci.yml +++ b/.github/workflows/linux-sampleapp-ci.yml @@ -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 diff --git a/tools/install-sys-dependencies-linux b/tools/install-sys-dependencies-linux index 13e72ff92fc..13322490972 100755 --- a/tools/install-sys-dependencies-linux +++ b/tools/install-sys-dependencies-linux @@ -2,24 +2,6 @@ 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-*" - # Bump this version if the CI has been broken due to the packages update. - LIBC_PACKAGE_VERSION="2.35-*" - - 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 llvm-14 clang-tidy-14 libboost-all-dev rustc --fix-missing