Skip to content

Commit 1796f40

Browse files
authored
Merge pull request #119 from Flamefire/update-gha
GHA: Update deprecated images and workflows
2 parents 4b9d9aa + 5aff52f commit 1796f40

File tree

2 files changed

+28
-14
lines changed

2 files changed

+28
-14
lines changed

.github/workflows/ci.yml

+26-12
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
Formatting:
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v3
3030
- name: Formatting
3131
uses: DoozyX/[email protected]
3232
with:
@@ -42,37 +42,51 @@ jobs:
4242
matrix:
4343
include:
4444
# Linux, gcc
45-
- { compiler: gcc-5, cxxstd: '14', boostBranch: boost-1.65.0, os: ubuntu-18.04 }
46-
- { compiler: gcc-5, cxxstd: '14', boostBranch: boost-1.77.0, os: ubuntu-18.04 }
47-
- { compiler: gcc-5, cxxstd: '14,1z', boostBranch: master, os: ubuntu-18.04 }
48-
- { compiler: gcc-11,cxxstd: '14,17,20', boostBranch: master, os: ubuntu-20.04 }
45+
- { compiler: gcc-5, cxxstd: '14', boostBranch: boost-1.65.0, os: ubuntu-22.04, container: 'ubuntu:18.04' }
46+
- { compiler: gcc-5, cxxstd: '14', boostBranch: boost-1.77.0, os: ubuntu-22.04, container: 'ubuntu:18.04' }
47+
- { compiler: gcc-12,cxxstd: '14,17,20', boostBranch: master, os: ubuntu-22.04 }
4948

5049
# Linux, clang
51-
- { compiler: clang-5.0, cxxstd: '14', boostBranch: boost-1.65.0, os: ubuntu-18.04 }
52-
- { compiler: clang-5.0, cxxstd: '14', boostBranch: boost-1.77.0, os: ubuntu-18.04 }
53-
- { compiler: clang-5.0, cxxstd: '14,1z', boostBranch: master, os: ubuntu-18.04 }
54-
- { compiler: clang-12, cxxstd: '14,17,20', boostBranch: master, os: ubuntu-20.04 }
50+
- { compiler: clang-5.0, cxxstd: '14', boostBranch: boost-1.65.0, os: ubuntu-22.04, container: 'ubuntu:18.04' }
51+
- { compiler: clang-5.0, cxxstd: '14', boostBranch: boost-1.77.0, os: ubuntu-22.04, container: 'ubuntu:18.04' }
52+
- { compiler: clang-14, cxxstd: '14,17,20', boostBranch: master, os: ubuntu-22.04 }
5553

5654
- { name: Collect coverage, coverage: yes,
5755
compiler: gcc-8, cxxstd: '14', boostBranch: master, os: ubuntu-20.04 }
5856

5957
timeout-minutes: 120
6058
runs-on: ${{matrix.os}}
59+
container: ${{matrix.container}}
6160

6261
steps:
63-
- uses: actions/checkout@v2
62+
- name: Prepare container environment
63+
if: matrix.container
64+
run: |
65+
export DEBIAN_FRONTEND=noninteractive
66+
apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
67+
apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y sudo software-properties-common curl lsb-release
68+
# Need (newer) git & cmake, and the older Ubuntu container may require requesting the key manually using port 80
69+
curl -sSL --retry ${NET_RETRY_COUNT:-5} 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xE1DD270288B4E6030699E45FA1715D88E1DF1F24' | sudo gpg --dearmor > /etc/apt/trusted.gpg.d/git-core_ubuntu_ppa.gpg
70+
for i in {1..${NET_RETRY_COUNT:-5}}; do sudo -E add-apt-repository -y ppa:git-core/ppa && break || sleep 10; done
71+
curl -sSL --retry ${NET_RETRY_COUNT:-5} 'https://apt.kitware.com/keys/kitware-archive-latest.asc' | sudo gpg --dearmor > /etc/apt/trusted.gpg.d/kitware-archive-latest.gpg
72+
for i in {1..${NET_RETRY_COUNT:-5}}; do sudo -E add-apt-repository -y "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" && break || sleep 10; done
73+
apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
74+
apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y g++ git cmake
75+
git config --global pack.threads 0
76+
77+
- uses: actions/checkout@v3
6478
with:
6579
# For coverage builds fetch the whole history, else only 1 commit using a 'fake ternary'
6680
fetch-depth: ${{ matrix.coverage && '0' || '1' }}
6781

6882
# Checking out Boost and all its submodules takes ages...
6983
- name: Cache Boost
70-
uses: actions/cache@v2
84+
uses: actions/cache@v3
7185
with:
7286
path: boost-root
7387
key: boost-${{matrix.boostBranch}}
7488
- name: Checkout Boost
75-
uses: actions/checkout@v2
89+
uses: actions/checkout@v3
7690
with:
7791
repository: boostorg/boost
7892
ref: ${{matrix.boostBranch}}

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
BOOST_VERSION: 1.71.0
1818
BOOST_ROOT: ${{github.workspace}}/dependencies/boost
1919
steps:
20-
- uses: actions/checkout@v2
21-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v3
2222
with:
2323
repository: boostorg/boost
2424
ref: boost-${{env.BOOST_VERSION}}

0 commit comments

Comments
 (0)