From 5f9c05b9446286936761dac00fad77b461845cef Mon Sep 17 00:00:00 2001 From: curquiza Date: Mon, 8 Jul 2024 18:33:00 +0200 Subject: [PATCH 1/4] Update minimal ubuntu version used from 18.04 to 20.04 --- .github/workflows/flaky-tests.yml | 4 ++-- .github/workflows/publish-apt-brew-pkg.yml | 4 ++-- .github/workflows/publish-binaries.yml | 8 ++++---- .github/workflows/test-suite.yml | 16 ++++++++-------- bors.toml | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/flaky-tests.yml b/.github/workflows/flaky-tests.yml index ba548fc38..7f2cd37c9 100644 --- a/.github/workflows/flaky-tests.yml +++ b/.github/workflows/flaky-tests.yml @@ -10,8 +10,8 @@ jobs: flaky: runs-on: ubuntu-latest container: - # Use ubuntu-18.04 to compile with glibc 2.27, which are the production expectations - image: ubuntu:18.04 + # Use ubuntu-20.04 to compile with glibc 2.28 + image: ubuntu:20.04 steps: - uses: actions/checkout@v3 - name: Install needed dependencies diff --git a/.github/workflows/publish-apt-brew-pkg.yml b/.github/workflows/publish-apt-brew-pkg.yml index 92a6904c7..9ba4355ca 100644 --- a/.github/workflows/publish-apt-brew-pkg.yml +++ b/.github/workflows/publish-apt-brew-pkg.yml @@ -20,8 +20,8 @@ jobs: runs-on: ubuntu-latest needs: check-version container: - # Use ubuntu-18.04 to compile with glibc 2.27 - image: ubuntu:18.04 + # Use ubuntu-20.04 to compile with glibc 2.28 + image: ubuntu:20.04 steps: - name: Install needed dependencies run: | diff --git a/.github/workflows/publish-binaries.yml b/.github/workflows/publish-binaries.yml index e1b78a0e6..a84f70c5f 100644 --- a/.github/workflows/publish-binaries.yml +++ b/.github/workflows/publish-binaries.yml @@ -39,8 +39,8 @@ jobs: ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true needs: check-version container: - # Use ubuntu-18.04 to compile with glibc 2.27 - image: ubuntu:18.04 + # Use ubuntu-20.04 to compile with glibc 2.28 + image: ubuntu:20.04 steps: - uses: actions/checkout@v3 - name: Install needed dependencies @@ -129,8 +129,8 @@ jobs: env: ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true container: - # Use ubuntu-18.04 to compile with glibc 2.27 - image: ubuntu:18.04 + # Use ubuntu-20.04 to compile with glibc 2.28 + image: ubuntu:20.04 strategy: matrix: include: diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index a1f2d0046..e3338a914 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -19,13 +19,13 @@ env: jobs: test-linux: - name: Tests on ubuntu-18.04 + name: Tests on ubuntu-20.04 runs-on: ubuntu-latest env: ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true container: - # Use ubuntu-18.04 to compile with glibc 2.27, which are the production expectations - image: ubuntu:18.04 + # Use ubuntu-20.04 to compile with glibc 2.28 + image: ubuntu:20.04 steps: - uses: actions/checkout@v3 - name: Install needed dependencies @@ -76,8 +76,8 @@ jobs: env: ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true container: - # Use ubuntu-18.04 to compile with glibc 2.27, which are the production expectations - image: ubuntu:18.04 + # Use ubuntu-20.04 to compile with glibc 2.28 + image: ubuntu:20.04 if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' steps: - uses: actions/checkout@v3 @@ -99,7 +99,7 @@ jobs: ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true runs-on: ubuntu-latest container: - image: ubuntu:18.04 + image: ubuntu:20.04 if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' steps: - uses: actions/checkout@v3 @@ -125,8 +125,8 @@ jobs: ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true runs-on: ubuntu-latest container: - # Use ubuntu-18.04 to compile with glibc 2.27, which are the production expectations - image: ubuntu:18.04 + # Use ubuntu-20.04 to compile with glibc 2.28 + image: ubuntu:20.04 steps: - uses: actions/checkout@v3 - name: Install needed dependencies diff --git a/bors.toml b/bors.toml index 1e7e418e5..8750ed993 100644 --- a/bors.toml +++ b/bors.toml @@ -1,5 +1,5 @@ status = [ - 'Tests on ubuntu-18.04', + 'Tests on ubuntu-20.04', 'Tests on macos-12', 'Tests on windows-2022', 'Run Clippy', From 2cda1360eee0ea449fd162b2214e2f299707778c Mon Sep 17 00:00:00 2001 From: curquiza Date: Tue, 9 Jul 2024 10:55:12 +0200 Subject: [PATCH 2/4] Remove ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION in CI --- .github/workflows/flaky-tests.yml | 3 +-- .github/workflows/fuzzer-indexing.yml | 3 +-- .github/workflows/publish-apt-brew-pkg.yml | 2 -- .github/workflows/publish-binaries.yml | 4 ---- .github/workflows/test-suite.yml | 8 -------- 5 files changed, 2 insertions(+), 18 deletions(-) diff --git a/.github/workflows/flaky-tests.yml b/.github/workflows/flaky-tests.yml index 7f2cd37c9..c7aa86d68 100644 --- a/.github/workflows/flaky-tests.yml +++ b/.github/workflows/flaky-tests.yml @@ -1,6 +1,5 @@ name: Look for flaky tests -env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true + on: workflow_dispatch: schedule: diff --git a/.github/workflows/fuzzer-indexing.yml b/.github/workflows/fuzzer-indexing.yml index a4913cb74..5d1ecc7f8 100644 --- a/.github/workflows/fuzzer-indexing.yml +++ b/.github/workflows/fuzzer-indexing.yml @@ -1,6 +1,5 @@ name: Run the indexing fuzzer -env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true + on: push: branches: diff --git a/.github/workflows/publish-apt-brew-pkg.yml b/.github/workflows/publish-apt-brew-pkg.yml index 9ba4355ca..0d4668579 100644 --- a/.github/workflows/publish-apt-brew-pkg.yml +++ b/.github/workflows/publish-apt-brew-pkg.yml @@ -15,8 +15,6 @@ jobs: debian: name: Publish debian packagge - env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true runs-on: ubuntu-latest needs: check-version container: diff --git a/.github/workflows/publish-binaries.yml b/.github/workflows/publish-binaries.yml index a84f70c5f..7ea0c86ab 100644 --- a/.github/workflows/publish-binaries.yml +++ b/.github/workflows/publish-binaries.yml @@ -35,8 +35,6 @@ jobs: publish-linux: name: Publish binary for Linux runs-on: ubuntu-latest - env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true needs: check-version container: # Use ubuntu-20.04 to compile with glibc 2.28 @@ -126,8 +124,6 @@ jobs: name: Publish binary for aarch64 runs-on: ubuntu-latest needs: check-version - env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true container: # Use ubuntu-20.04 to compile with glibc 2.28 image: ubuntu:20.04 diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index e3338a914..563810a5c 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -21,8 +21,6 @@ jobs: test-linux: name: Tests on ubuntu-20.04 runs-on: ubuntu-latest - env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true container: # Use ubuntu-20.04 to compile with glibc 2.28 image: ubuntu:20.04 @@ -73,8 +71,6 @@ jobs: test-all-features: name: Tests almost all features runs-on: ubuntu-latest - env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true container: # Use ubuntu-20.04 to compile with glibc 2.28 image: ubuntu:20.04 @@ -95,8 +91,6 @@ jobs: test-disabled-tokenization: name: Test disabled tokenization - env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true runs-on: ubuntu-latest container: image: ubuntu:20.04 @@ -121,8 +115,6 @@ jobs: # We run tests in debug also, to make sure that the debug_assertions are hit test-debug: name: Run tests in debug - env: - ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true runs-on: ubuntu-latest container: # Use ubuntu-20.04 to compile with glibc 2.28 From 7da95d62e29b6f9b05fdd9866c95adf5fcf48958 Mon Sep 17 00:00:00 2001 From: curquiza Date: Tue, 9 Jul 2024 13:58:51 +0200 Subject: [PATCH 3/4] Add DEBIAN_FRONTEND to avoid interaction with tzdata --- .github/workflows/publish-binaries.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publish-binaries.yml b/.github/workflows/publish-binaries.yml index 7ea0c86ab..6b5a35124 100644 --- a/.github/workflows/publish-binaries.yml +++ b/.github/workflows/publish-binaries.yml @@ -124,6 +124,8 @@ jobs: name: Publish binary for aarch64 runs-on: ubuntu-latest needs: check-version + env: + DEBIAN_FRONTEND: noninteractive container: # Use ubuntu-20.04 to compile with glibc 2.28 image: ubuntu:20.04 From c85dd9f635411319c39cd8c879e1b9199cacae02 Mon Sep 17 00:00:00 2001 From: Tamo Date: Thu, 11 Jul 2024 11:52:42 +0200 Subject: [PATCH 4/4] install a default stable toolchain before cargo build tries to install cross --- .github/workflows/publish-binaries.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/publish-binaries.yml b/.github/workflows/publish-binaries.yml index 6b5a35124..6289a7015 100644 --- a/.github/workflows/publish-binaries.yml +++ b/.github/workflows/publish-binaries.yml @@ -162,6 +162,9 @@ jobs: echo '[target.aarch64-unknown-linux-gnu]' >> ~/.cargo/config echo 'linker = "aarch64-linux-gnu-gcc"' >> ~/.cargo/config echo 'JEMALLOC_SYS_WITH_LG_PAGE=16' >> $GITHUB_ENV + - name: Install a default toolchain that will be used to build cargo cross + run: | + rustup default stable - name: Cargo build uses: actions-rs/cargo@v1 with: