168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove ambigous step

This commit is contained in:
Rick Vogel 2022-10-31 11:27:49 +01:00
parent 74118fd425
commit 365d09f108
1 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
.github/workflows/cmake.yml vendored
View File

@ -24,7 +24,12 @@ jobs:
environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat", environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
archiver: "7z a", archiver: "7z a",
generators: "Visual Studio 17 2022", generators: "Visual Studio 17 2022",
qtcmakedir: "../Qt/5.15.2/msvc2019_64/lib/cmake/Qt5", # TODO find better solution cmake:
{
qtversion: "5.15.2",
qtdirkey: "Qt5_DIR",
qtdirvalue: "../Qt/5.15.2/msvc2019_64/lib/cmake/Qt5",
},
} }
- { - {
name: "Windows 2019 MSVC Qt5", name: "Windows 2019 MSVC Qt5",
@ -36,7 +41,12 @@ jobs:
environment_script: "C:/Program Files/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat", environment_script: "C:/Program Files/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat",
archiver: "7z a", archiver: "7z a",
generators: "Visual Studio 16 2019", generators: "Visual Studio 16 2019",
qtcmakedir: "../Qt/5.15.2/msvc2019_64/lib/cmake/Qt5", # TODO find better solution cmake:
{
qtversion: "5.15.2",
qtdirkey: "Qt5_DIR",
qtdirvalue: "../Qt/5.15.2/msvc2019_64/lib/cmake/Qt5",
},
} }
- { - {
name: "Ubuntu_Latest_GCC Qt5", name: "Ubuntu_Latest_GCC Qt5",
@ -47,7 +57,12 @@ jobs:
cxx: "g++", cxx: "g++",
archiver: "7z a", archiver: "7z a",
generators: "Ninja", generators: "Ninja",
qtcmakedir: "../Qt/5.15.2/gcc_64/lib/cmake/Qt5", # TODO find better solution cmake:
{
qtversion: "5.15.2",
qtdirkey: "Qt5_DIR",
qtdirvalue: "../Qt/5.15.2/gcc_64/lib/cmake/Qt5",
},
} }
- { - {
name: "Ubuntu_GCC_9 Qt5", name: "Ubuntu_GCC_9 Qt5",
@ -58,7 +73,12 @@ jobs:
cxx: "g++", cxx: "g++",
archiver: "7z a", archiver: "7z a",
generators: "Ninja", generators: "Ninja",
qtcmakedir: "../Qt/5.15.2/gcc_64/lib/cmake/Qt5", # TODO find better solution cmake:
{
qtversion: "5.15.2",
qtdirkey: "Qt5_DIR",
qtdirvalue: "../Qt/5.15.2/gcc_64/lib/cmake/Qt5",
},
} }
- { - {
name: "macOS Latest Clang Qt5", name: "macOS Latest Clang Qt5",
@ -69,7 +89,12 @@ jobs:
cxx: "clang++", cxx: "clang++",
archiver: "7za a", archiver: "7za a",
generators: "Ninja", generators: "Ninja",
qtcmakedir: "../Qt/5.15.2/clang_64/lib/cmake/Qt5", # TODO find better solution cmake:
{
qtversion: "5.15.2",
qtdirkey: "Qt5_DIR",
qtdirvalue: "../Qt/5.15.2/clang_64/lib/cmake/Qt5",
},
} }
steps: steps:
@ -140,30 +165,6 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Version Delegate Qt5 MSVC
if: "endsWith(matrix.config.name, 'Qt5') && contains(matrix.config.name, 'MSVC')"
id: version-delegate
run: |
echo "Qt_VERSION=5.15.2" >> $GITHUB_OUTPUT
echo "Qt_DIR_KEY=Qt5_DIR" >> $GITHUB_OUTPUT
echo "Qt_DIR_VALUE=../Qt/5.15.2/msvc2019_64/lib/cmake/Qt5" >> $GITHUB_OUTPUT
- name: Version Delegate Qt5 GCC
if: "endsWith(matrix.config.name, 'Qt5') && contains(matrix.config.name, 'GCC')"
id: version-delegate
run: |
echo "Qt_VERSION=5.15.2" >> $GITHUB_OUTPUT
echo "Qt_DIR_KEY=Qt5_DIR" >> $GITHUB_OUTPUT
echo "Qt_DIR_VALUE=../Qt/5.15.2/gcc_64/lib/cmake/Qt5" >> $GITHUB_OUTPUT
- name: Version Delegate Qt5 Clang
if: "endsWith(matrix.config.name, 'Qt5') && contains(matrix.config.name, 'Clang')"
id: version-delegate
run: |
echo "Qt_VERSION=5.15.2" >> $GITHUB_OUTPUT
echo "Qt_DIR_KEY=Qt5_DIR" >> $GITHUB_OUTPUT
echo "Qt_DIR_VALUE=../Qt/5.15.2/gcc_64/lib/cmake/Qt5" >> $GITHUB_OUTPUT
- name: Cache Qt - name: Cache Qt
id: cache-qt-5-15 id: cache-qt-5-15
uses: actions/cache@v1 # not v2! uses: actions/cache@v1 # not v2!
@ -195,7 +196,7 @@ jobs:
-DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \ -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \
-G "${{ matrix.config.generators }}" \ -G "${{ matrix.config.generators }}" \
-DCMAKE_INSTALL_PREFIX:PATH=instdir \ -DCMAKE_INSTALL_PREFIX:PATH=instdir \
-D${{ steps.version-delegate.outputs.Qt_DIR_KEY }}:PATH="${{ steps.version-delegate.outputs.Qt_DIR_VALUE }}" -D${{ matrix.config.cmake.qtdirkey }}:PATH="${{ matrix.config.cmake.qtdirvalue }}"
- name: Build - name: Build
shell: bash shell: bash
run: cmake --build . --config ${{ matrix.config.build_type }} run: cmake --build . --config ${{ matrix.config.build_type }}