From c66b57219052eff054dc966d0753710c9b124081 Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Wed, 12 Feb 2025 09:49:50 +0100 Subject: [PATCH] Bump Ubuntu from 20.04 to 22.04 --- .github/workflows/flaky-tests.yml | 36 +++++------ .github/workflows/publish-apt-brew-pkg.yml | 42 ++++++------- .github/workflows/publish-binaries.yml | 70 +++++++++++----------- .github/workflows/test-suite.yml | 16 ++--- bors.toml | 2 +- 5 files changed, 83 insertions(+), 83 deletions(-) diff --git a/.github/workflows/flaky-tests.yml b/.github/workflows/flaky-tests.yml index 530767387..a87869f13 100644 --- a/.github/workflows/flaky-tests.yml +++ b/.github/workflows/flaky-tests.yml @@ -9,22 +9,22 @@ jobs: flaky: runs-on: ubuntu-latest container: - # Use ubuntu-20.04 to compile with glibc 2.28 - image: ubuntu:20.04 + # Use ubuntu-22.04 to compile with glibc 2.35 + image: ubuntu:22.04 steps: - - uses: actions/checkout@v3 - - name: Install needed dependencies - run: | - apt-get update && apt-get install -y curl - apt-get install build-essential -y - - uses: dtolnay/rust-toolchain@1.81 - - name: Install cargo-flaky - run: cargo install cargo-flaky - - name: Run cargo flaky in the dumps - run: cd crates/dump; cargo flaky -i 100 --release - - name: Run cargo flaky in the index-scheduler - run: cd crates/index-scheduler; cargo flaky -i 100 --release - - name: Run cargo flaky in the auth - run: cd crates/meilisearch-auth; cargo flaky -i 100 --release - - name: Run cargo flaky in meilisearch - run: cd crates/meilisearch; cargo flaky -i 100 --release + - uses: actions/checkout@v3 + - name: Install needed dependencies + run: | + apt-get update && apt-get install -y curl + apt-get install build-essential -y + - uses: dtolnay/rust-toolchain@1.81 + - name: Install cargo-flaky + run: cargo install cargo-flaky + - name: Run cargo flaky in the dumps + run: cd crates/dump; cargo flaky -i 100 --release + - name: Run cargo flaky in the index-scheduler + run: cd crates/index-scheduler; cargo flaky -i 100 --release + - name: Run cargo flaky in the auth + run: cd crates/meilisearch-auth; cargo flaky -i 100 --release + - name: Run cargo flaky in meilisearch + run: cd crates/meilisearch; cargo flaky -i 100 --release diff --git a/.github/workflows/publish-apt-brew-pkg.yml b/.github/workflows/publish-apt-brew-pkg.yml index 143d3e7f4..47d8d9665 100644 --- a/.github/workflows/publish-apt-brew-pkg.yml +++ b/.github/workflows/publish-apt-brew-pkg.yml @@ -18,28 +18,28 @@ jobs: runs-on: ubuntu-latest needs: check-version container: - # Use ubuntu-20.04 to compile with glibc 2.28 - image: ubuntu:20.04 + # Use ubuntu-22.04 to compile with glibc 2.35 + image: ubuntu:22.04 steps: - - name: Install needed dependencies - run: | - apt-get update && apt-get install -y curl - apt-get install build-essential -y - - uses: dtolnay/rust-toolchain@1.81 - - name: Install cargo-deb - run: cargo install cargo-deb - - uses: actions/checkout@v3 - - name: Build deb package - run: cargo deb -p meilisearch -o target/debian/meilisearch.deb - - name: Upload debian pkg to release - uses: svenstaro/upload-release-action@2.7.0 - with: - repo_token: ${{ secrets.MEILI_BOT_GH_PAT }} - file: target/debian/meilisearch.deb - asset_name: meilisearch.deb - tag: ${{ github.ref }} - - name: Upload debian pkg to apt repository - run: curl -F package=@target/debian/meilisearch.deb https://${{ secrets.GEMFURY_PUSH_TOKEN }}@push.fury.io/meilisearch/ + - name: Install needed dependencies + run: | + apt-get update && apt-get install -y curl + apt-get install build-essential -y + - uses: dtolnay/rust-toolchain@1.81 + - name: Install cargo-deb + run: cargo install cargo-deb + - uses: actions/checkout@v3 + - name: Build deb package + run: cargo deb -p meilisearch -o target/debian/meilisearch.deb + - name: Upload debian pkg to release + uses: svenstaro/upload-release-action@2.7.0 + with: + repo_token: ${{ secrets.MEILI_BOT_GH_PAT }} + file: target/debian/meilisearch.deb + asset_name: meilisearch.deb + tag: ${{ github.ref }} + - name: Upload debian pkg to apt repository + run: curl -F package=@target/debian/meilisearch.deb https://${{ secrets.GEMFURY_PUSH_TOKEN }}@push.fury.io/meilisearch/ homebrew: name: Bump Homebrew formula diff --git a/.github/workflows/publish-binaries.yml b/.github/workflows/publish-binaries.yml index fe0f95474..27b89b02b 100644 --- a/.github/workflows/publish-binaries.yml +++ b/.github/workflows/publish-binaries.yml @@ -3,7 +3,7 @@ name: Publish binaries to GitHub release on: workflow_dispatch: schedule: - - cron: '0 2 * * *' # Every day at 2:00am + - cron: "0 2 * * *" # Every day at 2:00am release: types: [published] @@ -37,26 +37,26 @@ jobs: runs-on: ubuntu-latest needs: check-version container: - # Use ubuntu-20.04 to compile with glibc 2.28 - image: ubuntu:20.04 + # Use ubuntu-22.04 to compile with glibc 2.35 + image: ubuntu:22.04 steps: - - uses: actions/checkout@v3 - - name: Install needed dependencies - run: | - apt-get update && apt-get install -y curl - apt-get install build-essential -y - - uses: dtolnay/rust-toolchain@1.81 - - name: Build - run: cargo build --release --locked - # No need to upload binaries for dry run (cron) - - name: Upload binaries to release - if: github.event_name == 'release' - uses: svenstaro/upload-release-action@2.7.0 - with: - repo_token: ${{ secrets.MEILI_BOT_GH_PAT }} - file: target/release/meilisearch - asset_name: meilisearch-linux-amd64 - tag: ${{ github.ref }} + - uses: actions/checkout@v3 + - name: Install needed dependencies + run: | + apt-get update && apt-get install -y curl + apt-get install build-essential -y + - uses: dtolnay/rust-toolchain@1.81 + - name: Build + run: cargo build --release --locked + # No need to upload binaries for dry run (cron) + - name: Upload binaries to release + if: github.event_name == 'release' + uses: svenstaro/upload-release-action@2.7.0 + with: + repo_token: ${{ secrets.MEILI_BOT_GH_PAT }} + file: target/release/meilisearch + asset_name: meilisearch-linux-amd64 + tag: ${{ github.ref }} publish-macos-windows: name: Publish binary for ${{ matrix.os }} @@ -74,19 +74,19 @@ jobs: artifact_name: meilisearch.exe asset_name: meilisearch-windows-amd64.exe steps: - - uses: actions/checkout@v3 - - uses: dtolnay/rust-toolchain@1.81 - - name: Build - run: cargo build --release --locked - # No need to upload binaries for dry run (cron) - - name: Upload binaries to release - if: github.event_name == 'release' - uses: svenstaro/upload-release-action@2.7.0 - with: - repo_token: ${{ secrets.MEILI_BOT_GH_PAT }} - file: target/release/${{ matrix.artifact_name }} - asset_name: ${{ matrix.asset_name }} - tag: ${{ github.ref }} + - uses: actions/checkout@v3 + - uses: dtolnay/rust-toolchain@1.81 + - name: Build + run: cargo build --release --locked + # No need to upload binaries for dry run (cron) + - name: Upload binaries to release + if: github.event_name == 'release' + uses: svenstaro/upload-release-action@2.7.0 + with: + repo_token: ${{ secrets.MEILI_BOT_GH_PAT }} + file: target/release/${{ matrix.artifact_name }} + asset_name: ${{ matrix.asset_name }} + tag: ${{ github.ref }} publish-macos-apple-silicon: name: Publish binary for macOS silicon @@ -127,8 +127,8 @@ jobs: env: DEBIAN_FRONTEND: noninteractive container: - # Use ubuntu-20.04 to compile with glibc 2.28 - image: ubuntu:20.04 + # Use ubuntu-22.04 to compile with glibc 2.35 + image: ubuntu:22.04 strategy: matrix: include: diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index fae93bd66..754342690 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -19,11 +19,11 @@ env: jobs: test-linux: - name: Tests on ubuntu-20.04 + name: Tests on ubuntu-22.04 runs-on: ubuntu-latest container: - # Use ubuntu-20.04 to compile with glibc 2.28 - image: ubuntu:20.04 + # Use ubuntu-22.04 to compile with glibc 2.35 + image: ubuntu:22.04 steps: - uses: actions/checkout@v3 - name: Install needed dependencies @@ -72,8 +72,8 @@ jobs: name: Tests almost all features runs-on: ubuntu-latest container: - # Use ubuntu-20.04 to compile with glibc 2.28 - image: ubuntu:20.04 + # Use ubuntu-22.04 to compile with glibc 2.35 + image: ubuntu:22.04 if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' steps: - uses: actions/checkout@v3 @@ -93,7 +93,7 @@ jobs: name: Test disabled tokenization runs-on: ubuntu-latest container: - image: ubuntu:20.04 + image: ubuntu:22.04 if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' steps: - uses: actions/checkout@v3 @@ -117,8 +117,8 @@ jobs: name: Run tests in debug runs-on: ubuntu-latest container: - # Use ubuntu-20.04 to compile with glibc 2.28 - image: ubuntu:20.04 + # Use ubuntu-22.04 to compile with glibc 2.35 + image: ubuntu:22.04 steps: - uses: actions/checkout@v3 - name: Install needed dependencies diff --git a/bors.toml b/bors.toml index 96e9ef65e..71a8748b8 100644 --- a/bors.toml +++ b/bors.toml @@ -1,5 +1,5 @@ status = [ - 'Tests on ubuntu-20.04', + 'Tests on ubuntu-22.04', 'Tests on macos-13', 'Tests on windows-2022', 'Run Clippy',