From 1afbe5dd6841351742513a55abd92690599708fa Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Sat, 3 Dec 2022 08:35:16 +0100 Subject: [PATCH 1/3] Revert "Use the ubuntu-20.04 runner as 18.04 is deprecated (#5626)" This reverts commit 4c8393999c41ca7e772bf56154d604d44cf9f4e0. --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 61eb022b2b..b6294e3f25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,9 +11,9 @@ jobs: strategy: fail-fast: false matrix: - # Stay on the oldest Ubuntu version that's still supported by Github Actions - # to avoid glibc incompatibilities as far as possible. - os: [macos-latest, ubuntu-20.04, windows-latest, macos-arm] + # Use ubuntu-18.04 because of glibc issues, + # see https://github.com/rescript-lang/rescript-vscode/issues/216. + os: [macos-latest, ubuntu-18.04, windows-latest, macos-arm] ocaml_compiler: [4.14.0] runs-on: ${{matrix.os}} From 7a01dd67dd4e8946290402ed88f7f1f6cbf2099b Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Sat, 3 Dec 2022 09:31:38 +0100 Subject: [PATCH 2/3] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 637b2f2a8c..a25e4b254d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ #### :bug: Bug Fix - Prevent inlining of async functions in additional cases https://github.com/rescript-lang/rescript-compiler/issues/5860 +- Revert to ubuntu-18.04 in CI to support Linux versions with older glibc https://github.com/rescript-lang/rescript-compiler/issues/5868 # 10.1.0 From 3b774bfa3b4a6b7b8469bc8a8cdfd805f237d729 Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Sat, 3 Dec 2022 09:34:07 +0100 Subject: [PATCH 3/3] Update comment --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b6294e3f25..b31dd3ce00 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,8 +11,9 @@ jobs: strategy: fail-fast: false matrix: - # Use ubuntu-18.04 because of glibc issues, - # see https://github.com/rescript-lang/rescript-vscode/issues/216. + # Use ubuntu-18.04 for glibc compatibility with older Linux distributions. + # Note that this will only be supported by Github until April 1st, 2023, + # see https://github.com/actions/runner-images/issues/6002. os: [macos-latest, ubuntu-18.04, windows-latest, macos-arm] ocaml_compiler: [4.14.0]