Skip to content

Commit

Permalink
fixed MSVC test file name
Browse files Browse the repository at this point in the history
  • Loading branch information
andrew-gresyk committed May 25, 2024
1 parent 0572dd5 commit ad48863
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@ jobs:
CC: gcc-13,
CXX: g++-13
}
# - {
# OS: ubuntu-24.04,
# CC: gcc-14,
# CXX: g++-14
# }
- {
OS: ubuntu-20.04,
CC: clang-6.0,
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/msbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,20 @@ jobs:

env:
SOLUTION_FILE_PATH: ${{ matrix.PLATFORM.SOLUTION_FILE_PATH }}
PROJECT_FILE_NAME: ${{ matrix.PLATFORM.PROJECT_FILE_NAME }}

strategy:
matrix:
PLATFORM:
- {
OS: windows-2019,
SOLUTION_FILE_PATH: projects\premake\ffsm2-vs-2019.sln
SOLUTION_FILE_PATH: projects\premake\ffsm2-vs-2019.sln,
PROJECT_FILE_NAME: test-15
}
- {
OS: windows-2022,
SOLUTION_FILE_PATH: projects\premake\ffsm2-vs-2022.sln
SOLUTION_FILE_PATH: projects\premake\ffsm2-vs-2022.sln,
PROJECT_FILE_NAME: test-17
}

BUILD_CONFIG: [ Release, Debug ]
Expand All @@ -40,4 +43,4 @@ jobs:

- name: Test
working-directory: ${{env.GITHUB_WORKSPACE}}
run: "binaries/test-17-${{matrix.BUILD_CONFIG}}-${{matrix.BUILD_PLATFORM}}.exe"
run: "binaries/${{env.PROJECT_FILE_NAME}}-${{matrix.BUILD_CONFIG}}-${{matrix.BUILD_PLATFORM}}.exe"

0 comments on commit ad48863

Please sign in to comment.