From b85cf5df0eebe42f7095e1e9c695a80266cdc6a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=80=E8=90=8C=E5=B0=8F=E6=B1=90?= <sumneko@hotmail.com>
Date: Wed, 17 Apr 2024 18:41:52 +0800
Subject: =?UTF-8?q?=E4=B8=8D=E8=A6=81=E4=BD=BF=E7=94=A8=20ubuntu:18.04=20?=
 =?UTF-8?q?=E7=9A=84=E5=AE=B9=E5=99=A8=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

有需要的人让他提PR
---
 .github/workflows/build.yml | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

(limited to '.github/workflows/build.yml')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 66640e50..f231e6e5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,8 +24,8 @@ jobs:
       matrix:
         include:
           - { os: ubuntu-22.04,   target: linux,   platform: linux-x64,   container: 'alpine:latest', libc: musl }
-          - { os: ubuntu-20.04,   target: linux,   platform: linux-x64,   container: 'ubuntu:18.04' }
-          - { os: ubuntu-20.04,   target: linux,   platform: linux-arm64, container: 'ubuntu:18.04' }
+          - { os: ubuntu-20.04,   target: linux,   platform: linux-x64    }
+          - { os: ubuntu-20.04,   target: linux,   platform: linux-arm64  }
           - { os: macos-11,       target: darwin,  platform: darwin-x64   }
           - { os: macos-11,       target: darwin,  platform: darwin-arm64 }
           - { os: windows-latest, target: windows, platform: win32-ia32   }
@@ -34,28 +34,6 @@ jobs:
     container:
       image: ${{ matrix.container }}
     steps:
-      - name: Prepare container
-        if: ${{ matrix.target == 'linux' && matrix.libc != 'musl' }}
-        run: |
-          apt-get update
-          apt-get install -y software-properties-common
-          add-apt-repository -y ppa:ubuntu-toolchain-r/test # For gcc-9 and g++-9
-          add-apt-repository -y ppa:git-core/ppa # For git>=2.18.
-          apt-get update
-          apt-get install -y sudo git gcc-9 g++-9
-
-      - name: Install aarch64-linux-gnu
-        if: ${{ matrix.platform == 'linux-arm64' && matrix.libc != 'musl' }}
-        run: |
-          apt-get update
-          apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
-
-      - name: Prepare container env
-        if: ${{ matrix.target == 'linux' && matrix.libc != 'musl' }}
-        run: |
-          update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 100
-          update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 100
-
       - name: Prepare container for musl
         if: ${{ matrix.target == 'linux' && matrix.libc == 'musl' }}
         run: |
-- 
cgit v1.2.3