Skip to content

Commit bed2d1b

Browse files
committed
update CI runners, actions, supported builds
1 parent 04155a9 commit bed2d1b

File tree

1 file changed

+9
-46
lines changed

1 file changed

+9
-46
lines changed

.github/workflows/ci.yml

+9-46
Original file line numberDiff line numberDiff line change
@@ -25,35 +25,21 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
os: [macos-11, windows-2019, ubuntu-20.04]
29-
arch: [x86, x64]
28+
os: [macos-latest, windows-latest, ubuntu-20.04]
29+
arch: [x64, arm64]
3030
include:
31-
- os: macos-11
31+
- os: macos-latest
3232
friendlyName: macOS
3333
targetPlatform: macOS
34-
- os: macos-11
35-
friendlyName: macOS
36-
targetPlatform: macOS
37-
arch: arm64
38-
- os: windows-2019
34+
- os: windows-latest
3935
friendlyName: Windows
4036
targetPlatform: win32
4137
- os: ubuntu-20.04
4238
friendlyName: Linux
4339
targetPlatform: ubuntu
44-
- os: ubuntu-20.04
45-
friendlyName: Linux
46-
targetPlatform: ubuntu
47-
arch: arm64
48-
- os: ubuntu-20.04
49-
friendlyName: Linux
50-
targetPlatform: ubuntu
51-
arch: arm
5240
exclude:
53-
- os: macos-11
54-
arch: x86
55-
- os: windows-2019
56-
arch: x86
41+
- os: windows-latest
42+
arch: arm64
5743
timeout-minutes: 20
5844
steps:
5945
# We need to use Xcode 11.7 for maximum compatibility with older macOS (x64)
@@ -64,14 +50,14 @@ jobs:
6450
# Delete the command line tools to make sure they don't get our builds
6551
# messed up with macOS SDK 11 stuff.
6652
sudo rm -rf /Library/Developer/CommandLineTools
67-
- uses: actions/checkout@v2
53+
- uses: actions/checkout@v4
6854
with:
6955
submodules: recursive
7056
# Needed for script/package.sh to work
7157
fetch-depth: 0
7258
- name: Install go
7359
if: matrix.targetPlatform == 'macOS'
74-
uses: actions/setup-go@v2
60+
uses: actions/setup-go@v5
7561
- name: Install dependencies
7662
run: npm install
7763
- name: Check formatting
@@ -83,12 +69,6 @@ jobs:
8369
run: |
8470
sudo apt-get update
8571
sudo apt-get install libcurl4-gnutls-dev libexpat1-dev gettext
86-
- name: Install extra dependencies for building Git on Ubuntu (x86)
87-
if: matrix.targetPlatform == 'ubuntu' && matrix.arch == 'x86'
88-
run: |
89-
sudo dpkg --add-architecture i386
90-
sudo apt-get update
91-
sudo apt-get install gcc-i686-linux-gnu binutils-i686-gnu libcurl4-gnutls-dev:i386 zlib1g-dev:i386 gettext
9272
- name: Install extra dependencies for building Git on Ubuntu (arm64)
9373
if: matrix.targetPlatform == 'ubuntu' && matrix.arch == 'arm64'
9474
run: |
@@ -98,24 +78,7 @@ jobs:
9878
sudo dpkg --add-architecture arm64
9979
sudo apt-get update
10080
sudo apt-get install gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu libcurl4-gnutls-dev:arm64 zlib1g-dev:arm64 gettext
101-
- name: Install extra dependencies for building Git on Ubuntu (arm)
102-
if: matrix.targetPlatform == 'ubuntu' && matrix.arch == 'arm'
103-
run: |
104-
sudo sed -i "s/^deb/deb [arch=amd64,i386]/g" /etc/apt/sources.list
105-
echo "deb [arch=arm64,armhf] http://azure.ports.ubuntu.com/ $(lsb_release -s -c) main universe multiverse restricted" | sudo tee -a /etc/apt/sources.list
106-
echo "deb [arch=arm64,armhf] http://azure.ports.ubuntu.com/ $(lsb_release -s -c)-updates main universe multiverse restricted" | sudo tee -a /etc/apt/sources.list
107-
sudo dpkg --add-architecture armhf
108-
sudo apt-get update
109-
sudo apt-get install gcc-arm-linux-gnueabihf binutils-arm-linux-gnueabihf libcurl4-gnutls-dev:armhf zlib1g-dev:armhf gettext
110-
- name: Build (except macOS arm64)
111-
if: matrix.targetPlatform != 'macOS' || matrix.arch != 'arm64'
112-
shell: bash
113-
run: script/build.sh
114-
env:
115-
TARGET_PLATFORM: ${{ matrix.targetPlatform }}
116-
TARGET_ARCH: ${{ matrix.arch }}
117-
- name: Build (macOS arm64)
118-
if: matrix.targetPlatform == 'macOS' && matrix.arch == 'arm64'
81+
- name: Build
11982
shell: bash
12083
run: script/build.sh
12184
env:

0 commit comments

Comments
 (0)