Skip to content

Commit 8ff7d24

Browse files
kernelwernelkernelwernel
authored
Merge pull request #365 from kernelwernel/dev
Dev
2 parents 8cc490d + dfc8b9e commit 8ff7d24

File tree

65 files changed

+544
-96
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+544
-96
lines changed

‎.github/FUNDING.yml‎

100644100755
File mode changed.

‎.github/ISSUE_TEMPLATE/report.md‎

100644100755
File mode changed.

‎.github/PULL_REQUEST_TEMPLATE.md‎

100644100755
File mode changed.

‎.github/actions/setup_cache/action.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: 'setup_cache'
2+
description: 'sets up the shared cache'
3+
inputs:
4+
compiler:
5+
required: true
6+
type: string
7+
build_type:
8+
required: true
9+
type: string
10+
generator:
11+
required: true
12+
type: string
13+
packaging_maintainer_mode:
14+
required: true
15+
type: string
16+
17+
18+
runs:
19+
using: "composite"
20+
steps:
21+
- name: Cache
22+
uses: actions/cache@v3
23+
with:
24+
# You might want to add .ccache to your cache configuration?
25+
path: |
26+
~/.cache/pip
27+
~/.ccache
28+
key: ${{ runner.os }}-${{ inputs.compiler }}-${{ inputs.build_type }}-${{ inputs.generator }}-${{ inputs.packaging_maintainer_mode }}-${{ hashFiles('**/CMakeLists.txt') }}
29+
restore-keys: |
30+
${{ runner.os }}-${{ inputs.compiler }}-${{ inputs.build_type }}

‎.github/workflows/build_run_win_32_debug.bat‎

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ echo on
22
cd "%~dp0..\.."
33
mkdir build
44
cd build
5-
cmake -DCMAKE_BUILD_TYPE=Debug -G "Visual Studio 17 2022" -A Win32 -S ..
5+
cmake -DCMAKE_CXX_FLAGS="-D__VMAWARE_DEBUG__" -G "Visual Studio 17 2022" -A Win32 -S ..
66
"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\devenv.com" "VMAware.sln" /Build "Debug|Win32" /Project "vmaware" /ProjectConfig "Debug|Win32"
77
copy "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Redist\MSVC\14.30.30704\debug_nonredist\x86\Microsoft.VC143.DebugCRT\ucrtbased.dll" Debug\
88
copy "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Redist\MSVC\14.30.30704\debug_nonredist\x86\Microsoft.VC143.DebugCRT\vcruntime140d.dll" Debug\

‎.github/workflows/build_run_win_32_release.bat‎

100644100755
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ cd "%~dp0..\.."
33
mkdir build
44
cd build
55
cmake -G "Visual Studio 17 2022" -A Win32 -S ..
6-
"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\devenv.com" "VMAware.sln" /Build "Release|Win32" /Project "vmaware" /ProjectConfig "Release|Win32"
6+
"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\devenv.com" "VMAware.sln" /Build "Release|Win32" /Project "vmaware" /ProjectConfig "Release|Win32"
7+
cd Release
8+
vmaware.exe

‎.github/workflows/build_run_win_64_debug.bat‎

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ echo on
22
cd "%~dp0..\.."
33
mkdir build
44
cd build
5-
cmake -DCMAKE_BUILD_TYPE=Debug -G "Visual Studio 17 2022" -A x64 -S ..
5+
cmake -DCMAKE_CXX_FLAGS="-D__VMAWARE_DEBUG__" .. -G "Visual Studio 17 2022" -A x64 -S ..
66
"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\devenv.com" "VMAware.sln" /Build "Debug|x64" /Project "vmaware" /ProjectConfig "Debug|x64"
77
copy "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Redist\MSVC\14.30.30704\debug_nonredist\x86\Microsoft.VC143.DebugCRT\ucrtbased.dll" Debug\
88
copy "C:\Program Files (x86)\Microsoft Visual Studio\2022\Enterprise\VC\Redist\MSVC\14.30.30704\debug_nonredist\x86\Microsoft.VC143.DebugCRT\vcruntime140d.dll" Debug\

‎.github/workflows/build_run_win_64_release.bat‎

100644100755
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1+
2+
"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\devenv.com" "VMAware.sln" /Build "Release|x64" /Project "vmaware" /ProjectConfig "Release|x64"
3+
4+
15
echo on
26
cd "%~dp0..\.."
37
mkdir build
48
cd build
59
cmake -G "Visual Studio 17 2022" -A x64 -S ..
6-
"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\devenv.com" "VMAware.sln" /Build "Release|x64" /Project "vmaware" /ProjectConfig "Release|x64"
10+
"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\devenv.com" "VMAware.sln" /Build "Release|x64" /Project "vmaware" /ProjectConfig "Release|x64"
11+
cd Release
12+
vmaware.exe

‎.github/workflows/cmake-multi-platform.yml‎

100644100755
File mode changed.

‎.github/workflows/code_ql_analysis.yml‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches: [ main, dev ]
17+
pull_request:
18+
# The branches below must be a subset of the branches above
19+
branches: [ main, dev ]
20+
21+
22+
jobs:
23+
analyze:
24+
name: Analyze
25+
runs-on: ubuntu-latest
26+
permissions:
27+
actions: read
28+
contents: read
29+
security-events: write
30+
31+
strategy:
32+
fail-fast: false
33+
matrix:
34+
language: [ 'cpp' ]
35+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
36+
# Learn more about CodeQL language support at https://git.io/codeql-language-support
37+
compiler:
38+
# you can specify the version after `-` like "llvm-13.0.0".
39+
- gcc-14
40+
generator:
41+
- "Ninja Multi-Config"
42+
build_type:
43+
- Debug
44+
packaging_maintainer_mode:
45+
- ON
46+
47+
48+
steps:
49+
- uses: actions/checkout@v3
50+
51+
- name: Setup Cache
52+
uses: ./.github/actions/setup_cache
53+
with:
54+
compiler: ${{ matrix.compiler }}
55+
build_type: ${{ matrix.build_type }}
56+
packaging_maintainer_mode: ${{ matrix.packaging_maintainer_mode }}
57+
generator: ${{ matrix.generator }}
58+
59+
- name: Setup Cpp
60+
uses: aminya/setup-cpp@v1
61+
with:
62+
compiler: ${{ matrix.compiler }}
63+
vcvarsall: ${{ contains(matrix.os, 'windows' )}}
64+
65+
cmake: true
66+
ninja: true
67+
vcpkg: false
68+
ccache: true
69+
clangtidy: false
70+
71+
cppcheck: false
72+
73+
gcovr: false
74+
opencppcoverage: false
75+
76+
# make sure coverage is only enabled for Debug builds, since it sets -O0 to make sure coverage
77+
# has meaningful results
78+
- name: Configure CMake
79+
run: |
80+
cmake -S . -B ./build -G "${{matrix.generator}}" -DCMAKE_BUILD_TYPE:STRING=${{matrix.build_type}} -DVMAware_PACKAGING_MAINTAINER_MODE:BOOL=${{matrix.packaging_maintainer_mode}} -DVMAware_ENABLE_COVERAGE:BOOL=${{ matrix.build_type == 'Debug' }}
81+
82+
# Initializes the CodeQL tools for scanning.
83+
- name: Initialize CodeQL
84+
uses: github/codeql-action/init@v3
85+
with:
86+
languages: ${{ matrix.language }}
87+
# If you wish to specify custom queries, you can do so here or in a config file.
88+
# By default, queries listed here will override any specified in a config file.
89+
# Prefix the list here with "+" to use these queries and those in the config file.
90+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
91+
92+
93+
- name: Build
94+
# Execute the build. You can specify a specific target with "--target <NAME>"
95+
run: |
96+
cmake --build ./build --config ${{matrix.build_type}}
97+
98+
- name: Perform CodeQL Analysis
99+
uses: github/codeql-action/analyze@v2

0 commit comments

Comments
 (0)