Tha_14/tomato-testing
1
0
Fork 0
forked from Green-Sky/tomato
Code Pull Requests Actions Packages Releases Activity

ci/cd maintenance

Browse Source 
remove extra ;
This commit is contained in:
Green Sky 2024-08-10 12:04:22 +02:00
parent f9c9eefb40
commit ebbaaa93b1
No known key found for this signature in database
3 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.github/workflows/cd.yml vendored
View File

@ -146,11 +146,11 @@ jobs:
with: with:
submodules: recursive submodules: recursive
- name: update vcpkg #- name: update vcpkg
shell: bash # shell: bash
run: | # run: |
cd C:/vcpkg # cd C:/vcpkg
git pull # git pull
- name: Install Dependencies - 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 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 echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
fi 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 - name: Compress artifacts
shell: powershell shell: powershell
run: | run: |
@ -205,11 +211,11 @@ jobs:
with: with:
submodules: recursive submodules: recursive
- name: update vcpkg #- name: update vcpkg
shell: bash # shell: bash
run: | # run: |
cd C:/vcpkg # cd C:/vcpkg
git pull # git pull
- name: Install Dependencies - 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 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 echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
fi 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 - name: Compress artifacts
shell: powershell shell: powershell
run: | run: |

10
.github/workflows/ci.yml vendored
View File

@ -122,11 +122,11 @@ jobs:
with: with:
submodules: recursive submodules: recursive
- name: update vcpkg #- name: update vcpkg
shell: bash # shell: bash
run: | # run: |
cd C:/vcpkg # cd C:/vcpkg
git pull # git pull
- name: Install Dependencies - 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 run: vcpkg install pkgconf:x64-windows libsodium:x64-windows-static pthreads:x64-windows-static opus:x64-windows-static libvpx:x64-windows-static

2
src/tox_avatar_manager.cpp
View File

@ -26,7 +26,7 @@
namespace Components { namespace Components {
struct TagAvatarImageHandled {}; struct TagAvatarImageHandled {};
}; }
ToxAvatarManager::ToxAvatarManager( ToxAvatarManager::ToxAvatarManager(
//RegistryMessageModel& rmm, //RegistryMessageModel& rmm,