From ebbaaa93b1f409a913fc9b34cf93c4b86a1cd219 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Sat, 10 Aug 2024 12:04:22 +0200 Subject: [PATCH] ci/cd maintenance remove extra ; --- .github/workflows/cd.yml | 32 ++++++++++++++++++++++---------- .github/workflows/ci.yml | 10 +++++----- src/tox_avatar_manager.cpp | 2 +- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index a492a1af..f06909f5 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -146,11 +146,11 @@ jobs: with: submodules: recursive - - name: update vcpkg - shell: bash - run: | - cd C:/vcpkg - git pull + #- name: update vcpkg + # shell: bash + # run: | + # cd C:/vcpkg + # git pull - name: Install Dependencies run: vcpkg install pkgconf:x64-windows libsodium:x64-windows-static pthreads:x64-windows-static opus:x64-windows-static libvpx:x64-windows-static @@ -182,6 +182,12 @@ jobs: echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT fi + - name: Clean temporary artifacts + # msvc sometimes produces .ilk files, which are used for linking only + shell: powershell + run: | + Remove-Item "${{github.workspace}}/build/bin/*.ilk" + - name: Compress artifacts shell: powershell run: | @@ -205,11 +211,11 @@ jobs: with: submodules: recursive - - name: update vcpkg - shell: bash - run: | - cd C:/vcpkg - git pull + #- name: update vcpkg + # shell: bash + # run: | + # cd C:/vcpkg + # git pull - name: Install Dependencies run: vcpkg install pkgconf:x64-windows libsodium:x64-windows-static pthreads:x64-windows-static opus:x64-windows-static libvpx:x64-windows-static @@ -241,6 +247,12 @@ jobs: echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT fi + - name: Clean temporary artifacts + # msvc sometimes produces .ilk files, which are used for linking only + shell: powershell + run: | + Remove-Item "${{github.workspace}}/build/bin/*.ilk" + - name: Compress artifacts shell: powershell run: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3a900b20..e7ae5625 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -122,11 +122,11 @@ jobs: with: submodules: recursive - - name: update vcpkg - shell: bash - run: | - cd C:/vcpkg - git pull + #- name: update vcpkg + # shell: bash + # run: | + # cd C:/vcpkg + # git pull - name: Install Dependencies run: vcpkg install pkgconf:x64-windows libsodium:x64-windows-static pthreads:x64-windows-static opus:x64-windows-static libvpx:x64-windows-static diff --git a/src/tox_avatar_manager.cpp b/src/tox_avatar_manager.cpp index bd75c8b3..70f3abce 100644 --- a/src/tox_avatar_manager.cpp +++ b/src/tox_avatar_manager.cpp @@ -26,7 +26,7 @@ namespace Components { struct TagAvatarImageHandled {}; -}; +} ToxAvatarManager::ToxAvatarManager( //RegistryMessageModel& rmm,