From 1436b7affe907a9c321858642faa0efd7516eaf0 Mon Sep 17 00:00:00 2001 From: Jenny Li Date: Fri, 26 Aug 2022 10:06:54 +0800 Subject: [PATCH] Change CI to use ubuntu 20.04 (#18839) Signed-off-by: Jenny Li Signed-off-by: Jenny Li --- .env | 6 +++--- .github/mergify.yml | 20 ++++++++++---------- .github/workflows/code-checker.yaml | 28 ++++++++++++---------------- .github/workflows/main.yaml | 2 +- 4 files changed, 26 insertions(+), 30 deletions(-) diff --git a/.env b/.env index f68197c645..3d264da530 100644 --- a/.env +++ b/.env @@ -1,8 +1,8 @@ IMAGE_REPO=milvusdb IMAGE_ARCH=amd64 -OS_NAME=ubuntu18.04 -DATE_VERSION=20220708-c5b5afb -LATEST_DATE_VERSION=20220708-c5b5afb +OS_NAME=ubuntu20.04 +DATE_VERSION=20220825-0bb6526 +LATEST_DATE_VERSION=20220825-0bb6526 MINIO_ADDRESS=minio:9000 PULSAR_ADDRESS=pulsar://pulsar:6650 ETCD_ENDPOINTS=etcd:2379 diff --git a/.github/mergify.yml b/.github/mergify.yml index fb1964e87e..55fd1ea929 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -33,8 +33,8 @@ pull_request_rules: - or: - base=master - base~=^2(\.\d+){2}$ - - "status-success=Code Checker AMD64 Ubuntu 18.04" - - "status-success=Build and test AMD64 Ubuntu 18.04" + - "status-success=Code Checker AMD64 Ubuntu 20.04" + - "status-success=Build and test AMD64 Ubuntu 20.04" # - "status-success=Code Checker MacOS 11" - "status-success=Code Checker CentOS 7" - "status-success=cpu-e2e" @@ -86,8 +86,8 @@ pull_request_rules: - or: - base=master - base~=^2(\.\d+){2}$ - - "status-success=Code Checker AMD64 Ubuntu 18.04" - - "status-success=Build and test AMD64 Ubuntu 18.04" + - "status-success=Code Checker AMD64 Ubuntu 20.04" + - "status-success=Build and test AMD64 Ubuntu 20.04" # - "status-success=Code Checker MacOS 11" - "status-success=Code Checker CentOS 7" - -files~=^(?!internal\/.*_test\.go).*$ @@ -175,8 +175,8 @@ pull_request_rules: - base=master - base~=^2(\.\d+){2}$ - title~=\[skip e2e\] - - "status-success=Code Checker AMD64 Ubuntu 18.04" - - "status-success=Build and test AMD64 Ubuntu 18.04" + - "status-success=Code Checker AMD64 Ubuntu 20.04" + - "status-success=Build and test AMD64 Ubuntu 20.04" # - "status-success=Code Checker MacOS 11" - "status-success=Code Checker CentOS 7" - files~=^(?=.*((\.(go|h|cpp)|CMakeLists.txt))).*$ @@ -195,8 +195,8 @@ pull_request_rules: - base~=^2(\.\d+){2}$ - files~=^(?=.*((\.(go|h|cpp)|CMakeLists.txt))).*$ - or: - - "status-success!=Code Checker AMD64 Ubuntu 18.04" - - "status-success!=Build and test AMD64 Ubuntu 18.04" + - "status-success!=Code Checker AMD64 Ubuntu 20.04" + - "status-success!=Build and test AMD64 Ubuntu 20.04" # - "status-success!=Code Checker MacOS 11" - "status-success!=Code Checker CentOS 7" actions: @@ -236,8 +236,8 @@ pull_request_rules: - base=master - base~=^2(\.\d+){2}$ - or: - - "check-failure=Code Checker AMD64 Ubuntu 18.04" - - "check-failure=Build and test AMD64 Ubuntu 18.04" + - "check-failure=Code Checker AMD64 Ubuntu 20.04" + - "check-failure=Build and test AMD64 Ubuntu 20.04" actions: comment: message: | diff --git a/.github/workflows/code-checker.yaml b/.github/workflows/code-checker.yaml index 55aab50ac3..285095ca81 100644 --- a/.github/workflows/code-checker.yaml +++ b/.github/workflows/code-checker.yaml @@ -32,36 +32,32 @@ jobs: fail-fast: false matrix: include: - - name: Code Checker AMD64 Ubuntu 18.04 - os: ubuntu-18.04 + - name: Code Checker AMD64 Ubuntu 20.04 + os: ubuntu-20.04 env: - UBUNTU: 18.04 + UBUNTU: 20.04 steps: - name: Checkout uses: actions/checkout@v2 - name: Cache CCache Volumes - if: ${{ matrix.os == 'ubuntu-18.04' }} uses: actions/cache@v3 with: - path: .docker/amd64-ubuntu18.04-ccache - key: ubuntu18.04-ccache-${{ hashFiles('internal/core/**') }} - restore-keys: ubuntu18.04-ccache- + path: .docker/amd64-ubuntu20.04-ccache + key: ubuntu20.04-ccache-${{ hashFiles('internal/core/**') }} + restore-keys: ubuntu20.04-ccache- - name: Cache Third Party - if: ${{ matrix.os == 'ubuntu-18.04' }} uses: actions/cache@v3 with: path: .docker/thirdparty - key: ubuntu18.04-thirdparty-${{ hashFiles('internal/core/thirdparty/**') }} - restore-keys: ubuntu18.04-thirdparty- + key: ubuntu20.04-thirdparty-${{ hashFiles('internal/core/thirdparty/**') }} + restore-keys: ubuntu20.04-thirdparty- - name: Cache Go Mod Volumes - if: ${{ matrix.os == 'ubuntu-18.04' }} uses: actions/cache@v3 with: - path: .docker/amd64-ubuntu18.04-go-mod - key: ubuntu18.04-go-mod-${{ hashFiles('**/go.sum') }} - restore-keys: ubuntu18.04-go-mod- + path: .docker/amd64-ubuntu20.04-go-mod + key: ubuntu20.04-go-mod-${{ hashFiles('**/go.sum') }} + restore-keys: ubuntu20.04-go-mod- - name: Code Check - if: ${{ matrix.os == 'ubuntu-18.04' }} env: CHECK_BUILDER: "1" run: | @@ -69,7 +65,7 @@ jobs: centos: name: Code Checker CentOS 7 # Run in centos docker - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 timeout-minutes: 60 steps: - name: Checkout diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index fffc129a5b..77c5d8937c 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -40,7 +40,7 @@ jobs: strategy: fail-fast: false matrix: - ubuntu: [18.04] + ubuntu: [20.04] env: UBUNTU: ${{ matrix.ubuntu }} steps: