Skip to content

Commit 6e0a5f7

Browse files
dimztimzvitaut
authored andcommitted
Update CI to Ubuntu 20.04 and to newer versions of actions
1 parent 48f525d commit 6e0a5f7

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

.github/workflows/doc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-20.04
1212

1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1515

1616
- name: Create Build Environment
1717
run: |

.github/workflows/linux.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -7,71 +7,71 @@ permissions:
77

88
jobs:
99
build:
10-
runs-on: ${{ matrix.os }}
10+
runs-on: ubuntu-20.04
1111
strategy:
1212
matrix:
1313
cxx: [g++-4.8, g++-10, clang++-9]
1414
build_type: [Debug, Release]
1515
std: [11]
16-
os: [ubuntu-18.04]
1716
include:
1817
- cxx: g++-4.8
1918
install: sudo apt install g++-4.8
20-
os: ubuntu-18.04
2119
- cxx: g++-8
2220
build_type: Debug
2321
std: 14
2422
install: sudo apt install g++-8
25-
os: ubuntu-18.04
2623
- cxx: g++-8
2724
build_type: Debug
2825
std: 17
2926
install: sudo apt install g++-8
30-
os: ubuntu-18.04
3127
- cxx: g++-9
3228
build_type: Debug
3329
std: 17
34-
install: sudo apt install g++-9
35-
os: ubuntu-18.04
3630
- cxx: g++-10
3731
build_type: Debug
3832
std: 17
39-
os: ubuntu-18.04
4033
- cxx: g++-11
4134
build_type: Debug
4235
std: 20
43-
os: ubuntu-20.04
4436
install: sudo apt install g++-11
4537
- cxx: clang++-8
4638
build_type: Debug
4739
std: 17
4840
cxxflags: -stdlib=libc++
49-
os: ubuntu-18.04
5041
install: sudo apt install clang-8 libc++-8-dev libc++abi-8-dev
42+
- cxx: clang++-9
43+
install: sudo apt install clang-9
5144
- cxx: clang++-9
5245
build_type: Debug
5346
fuzz: -DFMT_FUZZ=ON -DFMT_FUZZ_LINKMAIN=ON
5447
std: 17
55-
os: ubuntu-18.04
48+
install: sudo apt install clang-9
5649
- cxx: clang++-11
5750
build_type: Debug
5851
std: 20
59-
os: ubuntu-20.04
6052
- cxx: clang++-11
6153
build_type: Debug
6254
std: 20
6355
cxxflags: -stdlib=libc++
64-
os: ubuntu-20.04
6556
install: sudo apt install libc++-11-dev libc++abi-11-dev
6657
- shared: -DBUILD_SHARED_LIBS=ON
6758

6859
steps:
69-
- uses: actions/checkout@v2
60+
- uses: actions/checkout@v3
61+
62+
- name: Add repositories for older GCC
63+
run: |
64+
# Bellow two repos provide GCC 4.8, 5.5 and 6.4
65+
sudo apt-add-repository 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic main'
66+
sudo apt-add-repository 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic universe'
67+
# Bellow two repos additionally update GCC 6 to 6.5
68+
# sudo apt-add-repository 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic-updates main'
69+
# sudo apt-add-repository 'deb http://azure.archive.ubuntu.com/ubuntu/ bionic-updates universe'
70+
if: ${{ matrix.cxx == 'g++-4.8' }}
7071

7172
- name: Create Build Environment
7273
run: |
7374
${{matrix.install}}
74-
sudo apt update
7575
sudo apt install locales-all
7676
cmake -E make_directory ${{runner.workspace}}/build
7777

.github/workflows/macos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- shared: -DBUILD_SHARED_LIBS=ON
1616

1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
1919

2020
- name: Create Build Environment
2121
run: cmake -E make_directory ${{runner.workspace}}/build

.github/workflows/windows.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
standard: 20
4242

4343
steps:
44-
- uses: actions/checkout@v2
44+
- uses: actions/checkout@v3
4545

4646
- name: Create Build Environment
4747
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -82,7 +82,7 @@ jobs:
8282
release: false
8383
msystem: ${{matrix.sys}}
8484
pacboy: cc:p cmake:p ninja:p lld:p
85-
- uses: actions/checkout@v2
85+
- uses: actions/checkout@v3
8686
- name: Configure
8787
run: cmake -B ../build -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Debug
8888
env: { LDFLAGS: -fuse-ld=lld }

0 commit comments

Comments
 (0)