Skip to content

Commit 39cc495

Browse files
MigeloMigelo
authored
update actions and docker images (#622)
1 parent 9af9f16 commit 39cc495

10 files changed

+44
-44
lines changed

‎.github/workflows/clang-format-check.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
- 'test'
1212
- 'proto'
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- name: Run clang-format style check for C/C++/Protobuf source code.
16-
uses: jidicula/clang-format-action@v4.9.0
16+
uses: jidicula/clang-format-action@v4.11.0
1717
with:
1818
clang-format-version: '13'
1919
check-path: ${{ matrix.path }}

‎.github/workflows/codespell.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717

1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121
- name: Codespell
2222
uses: codespell-project/actions-codespell@v2

‎.github/workflows/linux_ci.yml

+15-15
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ on:
88

99
jobs:
1010
ubsan_linux:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-22.04
1212

1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515
- name: Setup
1616
shell: bash
1717
run: |
@@ -25,7 +25,7 @@ jobs:
2525
2626
# Restore both vcpkg and its artifacts from the GitHub cache service.
2727
- name: Restore vcpkg and its artifacts.
28-
uses: actions/cache@v2
28+
uses: actions/cache@v4
2929
with:
3030
# The first path is where vcpkg generates artifacts while consuming the vcpkg.json manifest file.
3131
# The second path is the location of vcpkg (it contains the vcpkg executable and data files).
@@ -53,10 +53,10 @@ jobs:
5353
rm -Rf build
5454
5555
asan_linux:
56-
runs-on: ubuntu-20.04
56+
runs-on: ubuntu-22.04
5757

5858
steps:
59-
- uses: actions/checkout@v2
59+
- uses: actions/checkout@v4
6060
- name: Setup
6161
shell: bash
6262
run: |
@@ -70,7 +70,7 @@ jobs:
7070
7171
# Restore both vcpkg and its artifacts from the GitHub cache service.
7272
- name: Restore vcpkg and its artifacts.
73-
uses: actions/cache@v2
73+
uses: actions/cache@v4
7474
with:
7575
# The first path is where vcpkg generates artifacts while consuming the vcpkg.json manifest file.
7676
# The second path is the location of vcpkg (it contains the vcpkg executable and data files).
@@ -98,10 +98,10 @@ jobs:
9898
rm -Rf build
9999
100100
msan_linux:
101-
runs-on: ubuntu-20.04
101+
runs-on: ubuntu-22.04
102102

103103
steps:
104-
- uses: actions/checkout@v2
104+
- uses: actions/checkout@v4
105105
- name: Setup
106106
shell: bash
107107
run: |
@@ -115,7 +115,7 @@ jobs:
115115
116116
# Restore both vcpkg and its artifacts from the GitHub cache service.
117117
- name: Restore vcpkg and its artifacts.
118-
uses: actions/cache@v2
118+
uses: actions/cache@v4
119119
with:
120120
# The first path is where vcpkg generates artifacts while consuming the vcpkg.json manifest file.
121121
# The second path is the location of vcpkg (it contains the vcpkg executable and data files).
@@ -143,10 +143,10 @@ jobs:
143143
rm -Rf build
144144
145145
tsan_linux:
146-
runs-on: ubuntu-20.04
146+
runs-on: ubuntu-22.04
147147

148148
steps:
149-
- uses: actions/checkout@v2
149+
- uses: actions/checkout@v4
150150
- name: Setup
151151
shell: bash
152152
run: |
@@ -160,7 +160,7 @@ jobs:
160160
161161
# Restore both vcpkg and its artifacts from the GitHub cache service.
162162
- name: Restore vcpkg and its artifacts.
163-
uses: actions/cache@v2
163+
uses: actions/cache@v4
164164
with:
165165
# The first path is where vcpkg generates artifacts while consuming the vcpkg.json manifest file.
166166
# The second path is the location of vcpkg (it contains the vcpkg executable and data files).
@@ -188,10 +188,10 @@ jobs:
188188
rm -Rf build
189189
190190
codecov:
191-
runs-on: ubuntu-20.04
191+
runs-on: ubuntu-22.04
192192

193193
steps:
194-
- uses: actions/checkout@v2
194+
- uses: actions/checkout@v4
195195
- name: Setup
196196
shell: bash
197197
run: |
@@ -205,7 +205,7 @@ jobs:
205205
206206
# Restore both vcpkg and its artifacts from the GitHub cache service.
207207
- name: Restore vcpkg and its artifacts.
208-
uses: actions/cache@v2
208+
uses: actions/cache@v4
209209
with:
210210
# The first path is where vcpkg generates artifacts while consuming the vcpkg.json manifest file.
211211
# The second path is the location of vcpkg (it contains the vcpkg executable and data files).

‎.github/workflows/mac_ci.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: macos-latest
1212

1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515
- name: Setup
1616
shell: bash
1717
run: |
@@ -24,7 +24,7 @@ jobs:
2424
2525
# Restore both vcpkg and its artifacts from the GitHub cache service.
2626
- name: Restore vcpkg and its artifacts.
27-
uses: actions/cache@v2
27+
uses: actions/cache@v4
2828
with:
2929
# The first path is where vcpkg generates artifacts while consuming the vcpkg.json manifest file.
3030
# The second path is the location of vcpkg (it contains the vcpkg executable and data files).
@@ -56,7 +56,7 @@ jobs:
5656
runs-on: macos-latest
5757

5858
steps:
59-
- uses: actions/checkout@v2
59+
- uses: actions/checkout@v4
6060
- name: Setup
6161
shell: bash
6262
run: |
@@ -69,7 +69,7 @@ jobs:
6969
7070
# Restore both vcpkg and its artifacts from the GitHub cache service.
7171
- name: Restore vcpkg and its artifacts.
72-
uses: actions/cache@v2
72+
uses: actions/cache@v4
7373
with:
7474
# The first path is where vcpkg generates artifacts while consuming the vcpkg.json manifest file.
7575
# The second path is the location of vcpkg (it contains the vcpkg executable and data files).
@@ -100,7 +100,7 @@ jobs:
100100
runs-on: macos-latest
101101

102102
steps:
103-
- uses: actions/checkout@v2
103+
- uses: actions/checkout@v4
104104
- name: Setup
105105
shell: bash
106106
run: |
@@ -113,7 +113,7 @@ jobs:
113113
114114
# Restore both vcpkg and its artifacts from the GitHub cache service.
115115
- name: Restore vcpkg and its artifacts.
116-
uses: actions/cache@v2
116+
uses: actions/cache@v4
117117
with:
118118
# The first path is where vcpkg generates artifacts while consuming the vcpkg.json manifest file.
119119
# The second path is the location of vcpkg (it contains the vcpkg executable and data files).
@@ -144,7 +144,7 @@ jobs:
144144
runs-on: macos-latest
145145

146146
steps:
147-
- uses: actions/checkout@v2
147+
- uses: actions/checkout@v4
148148
- name: Setup
149149
shell: bash
150150
run: |
@@ -157,7 +157,7 @@ jobs:
157157
158158
# Restore both vcpkg and its artifacts from the GitHub cache service.
159159
- name: Restore vcpkg and its artifacts.
160-
uses: actions/cache@v2
160+
uses: actions/cache@v4
161161
with:
162162
# The first path is where vcpkg generates artifacts while consuming the vcpkg.json manifest file.
163163
# The second path is the location of vcpkg (it contains the vcpkg executable and data files).

‎.github/workflows/novcpkg_build_master.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
run: brew update && brew install ninja cmake pkg-config curl openssl protobuf libsodium
5959
if: matrix.os == 'macos-latest'
6060

61-
- uses: actions/checkout@v2
61+
- uses: actions/checkout@v4
6262
with:
6363
submodules: recursive
6464

@@ -90,7 +90,7 @@ jobs:
9090
run: |
9191
cmake --build "${{ env.CMAKE_BUILD_DIR }}"
9292
93-
- uses: actions/upload-artifact@v2
93+
- uses: actions/upload-artifact@v4
9494
with:
95-
name: et-client-${{matrix.os}}
95+
name: et-client-${{matrix.os}}-gcc${{matrix.gcc}}
9696
path: ${{ env.CMAKE_BUILD_DIR }}/et${{matrix.extension}}

‎.github/workflows/novcpkg_build_release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
run: brew update && brew install ninja cmake pkg-config curl openssl protobuf libsodium
6161
if: matrix.os == 'macos-latest'
6262

63-
- uses: actions/checkout@v2
63+
- uses: actions/checkout@v4
6464
with:
6565
submodules: false
6666

@@ -92,7 +92,7 @@ jobs:
9292
run: |
9393
cmake --build "${{ env.CMAKE_BUILD_DIR }}"
9494
95-
- uses: actions/upload-artifact@v2
95+
- uses: actions/upload-artifact@v4
9696
with:
97-
name: et-client-${{matrix.os}}
97+
name: et-client-${{matrix.os}}-gcc${{matrix.gcc}}
9898
path: ${{ env.CMAKE_BUILD_DIR }}/et${{matrix.extension}}

‎.github/workflows/vcpkg_build_master.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
run: brew update && brew install ninja cmake
6767
if: matrix.os == 'macos-latest'
6868

69-
- uses: actions/checkout@v2
69+
- uses: actions/checkout@v4
7070
with:
7171
submodules: recursive
7272

@@ -79,7 +79,7 @@ jobs:
7979

8080
# Restore both vcpkg and its artifacts from the GitHub cache service.
8181
- name: Restore vcpkg and its artifacts.
82-
uses: actions/cache@v2
82+
uses: actions/cache@v4
8383
with:
8484
path: |
8585
${{ env.VCPKG_ROOT }}
@@ -122,7 +122,7 @@ jobs:
122122
run: |
123123
cmake --build "${{ env.CMAKE_BUILD_DIR }}"
124124
125-
- uses: actions/upload-artifact@v2
125+
- uses: actions/upload-artifact@v4
126126
with:
127-
name: et-client-${{matrix.os}}
127+
name: et-client-${{matrix.os}}-gcc${{matrix.gcc}}
128128
path: ${{ env.CMAKE_BUILD_DIR }}/et${{matrix.extension}}

‎.github/workflows/vcpkg_build_release.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
run: brew update && brew install ninja cmake
6969
if: matrix.os == 'macos-latest'
7070

71-
- uses: actions/checkout@v2
71+
- uses: actions/checkout@v4
7272
with:
7373
submodules: false
7474

@@ -81,7 +81,7 @@ jobs:
8181

8282
# Restore both vcpkg and its artifacts from the GitHub cache service.
8383
- name: Restore vcpkg and its artifacts.
84-
uses: actions/cache@v2
84+
uses: actions/cache@v4
8585
with:
8686
path: |
8787
${{ env.VCPKG_ROOT }}
@@ -124,7 +124,7 @@ jobs:
124124
run: |
125125
cmake --build "${{ env.CMAKE_BUILD_DIR }}"
126126
127-
- uses: actions/upload-artifact@v2
127+
- uses: actions/upload-artifact@v4
128128
with:
129-
name: et-client-${{matrix.os}}
129+
name: et-client-${{matrix.os}}-gcc${{matrix.gcc}}
130130
path: ${{ env.CMAKE_BUILD_DIR }}/et${{matrix.extension}}

‎docker/Dockerfile.client

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM centos:7 as base
1+
FROM centos:8 as base
22

33
ENV BUILD_REPOS="epel-release centos-release-scl" \
44
BUILD_DEPS="cmake3 boost-devel libsodium-devel ncurses-devel protobuf-devel \
@@ -18,7 +18,7 @@ RUN yum install -y $BUILD_REPOS && \
1818
bash -c "scl enable devtoolset-11 rh-git227 'cmake3 ../'" && \
1919
bash -c "scl enable devtoolset-11 'make -j $(grep ^processor /proc/cpuinfo |wc -l) && make install'"
2020

21-
FROM centos:7
21+
FROM centos:8
2222

2323
RUN yum install -y epel-release && \
2424
yum install -y protobuf-lite libsodium libatomic libunwind

‎docker/Dockerfile.server

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM centos:7 as base
1+
FROM centos:8 as base
22

33
ENV BUILD_REPOS="epel-release centos-release-scl" \
44
BUILD_DEPS="cmake3 boost-devel libsodium-devel ncurses-devel protobuf-devel \
@@ -18,7 +18,7 @@ RUN yum install -y $BUILD_REPOS && \
1818
bash -c "scl enable devtoolset-11 rh-git227 'cmake3 ../'" && \
1919
bash -c "scl enable devtoolset-11 'make -j $(grep ^processor /proc/cpuinfo |wc -l) && make install'"
2020

21-
FROM centos:7
21+
FROM centos:8
2222

2323
RUN yum install -y epel-release && \
2424
yum install -y protobuf-lite libsodium openssh-server libatomic libunwind

0 commit comments

Comments
 (0)