Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update actions and docker images #622

Merged
merged 1 commit into from
Feb 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
- 'test'
- 'proto'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Run clang-format style check for C/C++/Protobuf source code.
uses: jidicula/clang-format-action@v4.9.0
uses: jidicula/clang-format-action@v4.11.0
with:
clang-format-version: '13'
check-path: ${{ matrix.path }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Codespell
uses: codespell-project/actions-codespell@v2
30 changes: 15 additions & 15 deletions .github/workflows/linux_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ on:

jobs:
ubsan_linux:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup
shell: bash
run: |
Expand All @@ -25,7 +25,7 @@ jobs:

# Restore both vcpkg and its artifacts from the GitHub cache service.
- name: Restore vcpkg and its artifacts.
uses: actions/cache@v2
uses: actions/cache@v4
with:
# The first path is where vcpkg generates artifacts while consuming the vcpkg.json manifest file.
# The second path is the location of vcpkg (it contains the vcpkg executable and data files).
Expand Down Expand Up @@ -53,10 +53,10 @@ jobs:
rm -Rf build

asan_linux:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup
shell: bash
run: |
Expand All @@ -70,7 +70,7 @@ jobs:

# Restore both vcpkg and its artifacts from the GitHub cache service.
- name: Restore vcpkg and its artifacts.
uses: actions/cache@v2
uses: actions/cache@v4
with:
# The first path is where vcpkg generates artifacts while consuming the vcpkg.json manifest file.
# The second path is the location of vcpkg (it contains the vcpkg executable and data files).
Expand Down Expand Up @@ -98,10 +98,10 @@ jobs:
rm -Rf build

msan_linux:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup
shell: bash
run: |
Expand All @@ -115,7 +115,7 @@ jobs:

# Restore both vcpkg and its artifacts from the GitHub cache service.
- name: Restore vcpkg and its artifacts.
uses: actions/cache@v2
uses: actions/cache@v4
with:
# The first path is where vcpkg generates artifacts while consuming the vcpkg.json manifest file.
# The second path is the location of vcpkg (it contains the vcpkg executable and data files).
Expand Down Expand Up @@ -143,10 +143,10 @@ jobs:
rm -Rf build

tsan_linux:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup
shell: bash
run: |
Expand All @@ -160,7 +160,7 @@ jobs:

# Restore both vcpkg and its artifacts from the GitHub cache service.
- name: Restore vcpkg and its artifacts.
uses: actions/cache@v2
uses: actions/cache@v4
with:
# The first path is where vcpkg generates artifacts while consuming the vcpkg.json manifest file.
# The second path is the location of vcpkg (it contains the vcpkg executable and data files).
Expand Down Expand Up @@ -188,10 +188,10 @@ jobs:
rm -Rf build

codecov:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup
shell: bash
run: |
Expand All @@ -205,7 +205,7 @@ jobs:

# Restore both vcpkg and its artifacts from the GitHub cache service.
- name: Restore vcpkg and its artifacts.
uses: actions/cache@v2
uses: actions/cache@v4
with:
# The first path is where vcpkg generates artifacts while consuming the vcpkg.json manifest file.
# The second path is the location of vcpkg (it contains the vcpkg executable and data files).
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/mac_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: macos-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup
shell: bash
run: |
Expand All @@ -24,7 +24,7 @@ jobs:

# Restore both vcpkg and its artifacts from the GitHub cache service.
- name: Restore vcpkg and its artifacts.
uses: actions/cache@v2
uses: actions/cache@v4
with:
# The first path is where vcpkg generates artifacts while consuming the vcpkg.json manifest file.
# The second path is the location of vcpkg (it contains the vcpkg executable and data files).
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
runs-on: macos-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup
shell: bash
run: |
Expand All @@ -69,7 +69,7 @@ jobs:

# Restore both vcpkg and its artifacts from the GitHub cache service.
- name: Restore vcpkg and its artifacts.
uses: actions/cache@v2
uses: actions/cache@v4
with:
# The first path is where vcpkg generates artifacts while consuming the vcpkg.json manifest file.
# The second path is the location of vcpkg (it contains the vcpkg executable and data files).
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
runs-on: macos-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup
shell: bash
run: |
Expand All @@ -113,7 +113,7 @@ jobs:

# Restore both vcpkg and its artifacts from the GitHub cache service.
- name: Restore vcpkg and its artifacts.
uses: actions/cache@v2
uses: actions/cache@v4
with:
# The first path is where vcpkg generates artifacts while consuming the vcpkg.json manifest file.
# The second path is the location of vcpkg (it contains the vcpkg executable and data files).
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
runs-on: macos-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Setup
shell: bash
run: |
Expand All @@ -157,7 +157,7 @@ jobs:

# Restore both vcpkg and its artifacts from the GitHub cache service.
- name: Restore vcpkg and its artifacts.
uses: actions/cache@v2
uses: actions/cache@v4
with:
# The first path is where vcpkg generates artifacts while consuming the vcpkg.json manifest file.
# The second path is the location of vcpkg (it contains the vcpkg executable and data files).
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/novcpkg_build_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
run: brew update && brew install ninja cmake pkg-config curl openssl protobuf libsodium
if: matrix.os == 'macos-latest'

- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: recursive

Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
run: |
cmake --build "${{ env.CMAKE_BUILD_DIR }}"

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: et-client-${{matrix.os}}
name: et-client-${{matrix.os}}-gcc${{matrix.gcc}}
path: ${{ env.CMAKE_BUILD_DIR }}/et${{matrix.extension}}
6 changes: 3 additions & 3 deletions .github/workflows/novcpkg_build_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
run: brew update && brew install ninja cmake pkg-config curl openssl protobuf libsodium
if: matrix.os == 'macos-latest'

- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: false

Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
run: |
cmake --build "${{ env.CMAKE_BUILD_DIR }}"

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: et-client-${{matrix.os}}
name: et-client-${{matrix.os}}-gcc${{matrix.gcc}}
path: ${{ env.CMAKE_BUILD_DIR }}/et${{matrix.extension}}
8 changes: 4 additions & 4 deletions .github/workflows/vcpkg_build_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
run: brew update && brew install ninja cmake
if: matrix.os == 'macos-latest'

- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: recursive

Expand All @@ -79,7 +79,7 @@ jobs:

# Restore both vcpkg and its artifacts from the GitHub cache service.
- name: Restore vcpkg and its artifacts.
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: |
${{ env.VCPKG_ROOT }}
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
run: |
cmake --build "${{ env.CMAKE_BUILD_DIR }}"

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: et-client-${{matrix.os}}
name: et-client-${{matrix.os}}-gcc${{matrix.gcc}}
path: ${{ env.CMAKE_BUILD_DIR }}/et${{matrix.extension}}
8 changes: 4 additions & 4 deletions .github/workflows/vcpkg_build_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
run: brew update && brew install ninja cmake
if: matrix.os == 'macos-latest'

- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: false

Expand All @@ -81,7 +81,7 @@ jobs:

# Restore both vcpkg and its artifacts from the GitHub cache service.
- name: Restore vcpkg and its artifacts.
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: |
${{ env.VCPKG_ROOT }}
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
run: |
cmake --build "${{ env.CMAKE_BUILD_DIR }}"

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: et-client-${{matrix.os}}
name: et-client-${{matrix.os}}-gcc${{matrix.gcc}}
path: ${{ env.CMAKE_BUILD_DIR }}/et${{matrix.extension}}
4 changes: 2 additions & 2 deletions docker/Dockerfile.client
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM centos:7 as base
FROM centos:8 as base

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

FROM centos:7
FROM centos:8

RUN yum install -y epel-release && \
yum install -y protobuf-lite libsodium libatomic libunwind
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.server
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM centos:7 as base
FROM centos:8 as base

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

FROM centos:7
FROM centos:8

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