Bugfix for windows
This commit is contained in:
parent
1a8e324d00
commit
dd12f376c0
|
@ -162,9 +162,14 @@ jobs:
|
|||
echo "OPERATING_SYSTEM_NAME_SHORT=$OPERATING_SYSTEM_NAME_SHORT" >> $GITHUB_ENV
|
||||
echo "SRC_TDJNI_LIBNAME=$SRC_TDJNI_LIBNAME" >> $GITHUB_ENV
|
||||
echo "DEST_TDJNI_LIBNAME=$DEST_TDJNI_LIBNAME" >> $GITHUB_ENV
|
||||
- name: Install latest CMake
|
||||
if: matrix.os == 'windows-2019'
|
||||
uses: lukka/get-cmake@latest
|
||||
|
||||
- name: Install dependencies
|
||||
if: matrix.usedocker == 'false'
|
||||
shell: bash
|
||||
run: |
|
||||
echo "REVISION: $REVISION"
|
||||
|
||||
source ./scripts/continuous-integration/github-workflows/install-dependencies.sh
|
||||
- name: Restore artifacts, or setup vcpkg (do not install any package)
|
||||
if: matrix.os == 'windows-2019'
|
||||
uses: lukka/run-vcpkg@v7
|
||||
|
@ -183,14 +188,6 @@ jobs:
|
|||
run: |
|
||||
$VCPKG_DIR/vcpkg install gperf openssl:x64-windows-static zlib:x64-windows-static
|
||||
shell: bash
|
||||
|
||||
- name: Install dependencies
|
||||
if: matrix.usedocker == 'false'
|
||||
shell: bash
|
||||
run: |
|
||||
echo "REVISION: $REVISION"
|
||||
|
||||
source ./scripts/continuous-integration/github-workflows/install-dependencies.sh
|
||||
- name: Build
|
||||
if: matrix.usedocker == 'false'
|
||||
shell: bash
|
||||
|
|
|
@ -40,15 +40,15 @@ elif [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then
|
|||
#echo "Done .tlo"
|
||||
elif [[ "$OPERATING_SYSTEM_NAME" == "windows" ]]; then
|
||||
echo "==Windows=="
|
||||
#choco install ccache
|
||||
#choco install make
|
||||
choco install ccache
|
||||
choco install make
|
||||
#choco install windows-sdk-10.1
|
||||
#choco install visualstudio2019buildtools --version=16.10.4.0 --allow-downgrade --package-parameters "--passive"
|
||||
#choco install visualstudio2019-workload-vctools
|
||||
choco install visualstudio2019buildtools --version=16.10.4.0 --allow-downgrade --package-parameters "--passive"
|
||||
choco install visualstudio2019-workload-vctools
|
||||
#choco install openjdk11 --version=11.0.8.10
|
||||
choco install maven --version=3.8.2 --allow-downgrade
|
||||
choco install base64
|
||||
#choco install gperf
|
||||
choco install gperf
|
||||
choco install strawberryperl
|
||||
choco install nasm
|
||||
#choco install php --version=7.4.9 --package-parameters='"/ThreadSafe ""/InstallDir:C:\PHP"""'
|
||||
|
|
Loading…
Reference in New Issue