From 3f519cbcfcb5d1258eda668bddd96265d767570c Mon Sep 17 00:00:00 2001 From: Green Sky Date: Sat, 2 Dec 2023 03:12:09 +0100 Subject: [PATCH] add github ci --- .github/FUNDING.yml | 1 + .github/workflows/cd.yml | 43 +++++++++++++++++++++++ .github/workflows/ci.yml | 74 ++++++++++++++++++++++++++++++++++++++++ src/message_cleanser.cpp | 2 ++ 4 files changed, 120 insertions(+) create mode 100644 .github/FUNDING.yml create mode 100644 .github/workflows/cd.yml create mode 100644 .github/workflows/ci.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..55b649d --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +github: Green-Sky diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml new file mode 100644 index 0000000..71e2351 --- /dev/null +++ b/.github/workflows/cd.yml @@ -0,0 +1,43 @@ +name: ContinuousDelivery + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +env: + BUILD_TYPE: Release + +jobs: + windows: + timeout-minutes: 15 + + runs-on: windows-latest + + steps: + - uses: actions/checkout@v3 + with: + submodules: recursive + + - name: Install Dependencies + run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static + + # setup vs env + - uses: ilammy/msvc-dev-cmd@v1 + with: + arch: amd64 + + - name: Configure CMake + run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static + + - name: Build + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 + + - uses: actions/upload-artifact@v3 + with: + name: ${{ github.event.repository.name }}-windows-msvc-x86_64 + # TODO: do propper packing + path: | + ${{github.workspace}}/build/bin/ + diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..ba80d27 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,74 @@ +name: ContinuousIntegration + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +env: + BUILD_TYPE: Debug + +jobs: + linux: + timeout-minutes: 10 + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + with: + submodules: recursive + + - name: Install Dependencies + run: sudo apt update && sudo apt -y install libsodium-dev + + - name: Configure CMake + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + + - name: Build + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 + + macos: + timeout-minutes: 10 + + runs-on: macos-latest + + steps: + - uses: actions/checkout@v3 + with: + submodules: recursive + + - name: Install Dependencies + run: brew install libsodium + + - name: Configure CMake + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} + + - name: Build + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 + + windows: + timeout-minutes: 10 + + runs-on: windows-latest + + steps: + - uses: actions/checkout@v3 + with: + submodules: recursive + + - name: Install Dependencies + run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static + + # setup vs env + - uses: ilammy/msvc-dev-cmd@v1 + with: + arch: amd64 + + - name: Configure CMake + run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static + + - name: Build + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 + diff --git a/src/message_cleanser.cpp b/src/message_cleanser.cpp index aa03a3e..0038524 100644 --- a/src/message_cleanser.cpp +++ b/src/message_cleanser.cpp @@ -7,6 +7,8 @@ #include MessageCleanser::MessageCleanser(Contact3Registry& cr, RegistryMessageModel& rmm) : _cr(cr), _rmm(rmm) { + // config + // has MessageCleanser::old_age } MessageCleanser::~MessageCleanser(void) {