Skip to content

Commit ee9d6b3

Browse files
committed
Update GHA virtual environments
- remove ubuntu-16, windows-2016, macos-10.15 see actions/runner-images#5238 see actions/runner-images#5583 - add ubuntu-22, macos-12, macos-11
1 parent 89a16e4 commit ee9d6b3

2 files changed

Lines changed: 7 additions & 58 deletions

File tree

.github/workflows/build-and-test.yml

Lines changed: 5 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04, windows-2022, windows-2019, windows-2016, macos-10.15]
22+
os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, windows-2022, windows-2019, macos-12, macos-11]
2323
steps:
2424
- uses: actions/checkout@v2
2525
- name: Show initial environment
@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
os: [ubuntu-20.04, ubuntu-18.04, ubuntu-16.04]
39+
os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04]
4040
cmp: [gcc, clang]
4141
configuration: [default, static, debug, static-debug]
4242
steps:
@@ -50,37 +50,6 @@ jobs:
5050
- name: Collect and show test results
5151
run: python cue.py test-results
5252

53-
build-linux-old:
54-
name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
55-
runs-on: ${{ matrix.os }}
56-
env:
57-
CMP: ${{ matrix.cmp }}
58-
BCFG: ${{ matrix.configuration }}
59-
strategy:
60-
fail-fast: false
61-
matrix:
62-
os: [ubuntu-16.04]
63-
cmp: ["gcc-4.8", "gcc-4.9"]
64-
configuration: [default, static]
65-
steps:
66-
- uses: actions/checkout@v2
67-
- name: "apt-get install ${{ matrix.cmp }}"
68-
run: |
69-
export GCC_NAME="${{ matrix.cmp }}"
70-
sudo apt-get update
71-
sudo apt-get -y install software-properties-common
72-
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
73-
sudo apt-get update
74-
sudo apt-get -y install g++-${GCC_NAME#gcc-}
75-
- name: Prepare and compile dependencies
76-
run: python cue.py prepare
77-
- name: Build main module (example app)
78-
run: python cue.py build
79-
- name: Run main module tests
80-
run: python cue.py -T 15M test
81-
- name: Collect and show test results
82-
run: python cue.py test-results
83-
8453
build-macos:
8554
name: ${{ matrix.cmp }} / ${{ matrix.configuration }} / ${{ matrix.os }}
8655
runs-on: ${{ matrix.os }}
@@ -90,7 +59,7 @@ jobs:
9059
strategy:
9160
fail-fast: false
9261
matrix:
93-
os: [macos-10.15]
62+
os: [macos-12, macos-11]
9463
cmp: [clang]
9564
configuration: [default, debug]
9665
steps:
@@ -113,24 +82,16 @@ jobs:
11382
strategy:
11483
fail-fast: false
11584
matrix:
116-
os: [windows-2022, windows-2019, windows-2016]
117-
cmp: [gcc, vs2022, vs2019, vs2017]
85+
os: [windows-2022, windows-2019]
86+
cmp: [gcc, vs2022, vs2019]
11887
configuration: [default, static, debug, static-debug]
11988
exclude:
12089
- os: windows-2022
12190
cmp: vs2019
122-
- os: windows-2022
123-
cmp: vs2017
12491

12592
- os: windows-2019
12693
cmp: vs2022
127-
- os: windows-2019
128-
cmp: vs2017
12994

130-
- os: windows-2016
131-
cmp: vs2022
132-
- os: windows-2016
133-
cmp: vs2019
13495
steps:
13596
- uses: actions/checkout@v2
13697
- name: Prepare and compile dependencies

github-actions/ci-scripts-build.yml.example-full

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ jobs:
5959
extra: "CMD_CXXFLAGS=-std=c++11"
6060
name: "Ub-20 gcc-9 C++11, static"
6161

62-
- os: ubuntu-16.04
62+
- os: ubuntu-18.04
6363
cmp: clang
6464
configuration: default
65-
name: "Ub-16 clang-9"
65+
name: "Ub-18 clang-9"
6666

6767
- os: ubuntu-20.04
6868
cmp: clang
@@ -97,18 +97,6 @@ jobs:
9797
test: NO
9898
name: "Ub-20 gcc-9 + RT-5.1 beatnik"
9999

100-
- os: ubuntu-16.04
101-
cmp: gcc-4.8
102-
utoolchain: true
103-
configuration: default
104-
name: "Ub-16 gcc-4.8"
105-
106-
- os: ubuntu-16.04
107-
cmp: gcc-4.9
108-
utoolchain: true
109-
configuration: default
110-
name: "Ub-16 gcc-4.9"
111-
112100
- os: ubuntu-18.04
113101
cmp: gcc
114102
configuration: default

0 commit comments

Comments
 (0)