tdlight-team/tdlight-java-natives
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Bugfix for windows

Browse Source
This commit is contained in:
Andrea Cavalli 2021-09-14 01:55:55 +02:00
parent 1a8e324d00
commit dd12f376c0
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.github/workflows/platform_natives.yaml vendored
View File

@ -162,9 +162,14 @@ jobs:
echo "OPERATING_SYSTEM_NAME_SHORT=$OPERATING_SYSTEM_NAME_SHORT" >> $GITHUB_ENV echo "OPERATING_SYSTEM_NAME_SHORT=$OPERATING_SYSTEM_NAME_SHORT" >> $GITHUB_ENV
echo "SRC_TDJNI_LIBNAME=$SRC_TDJNI_LIBNAME" >> $GITHUB_ENV echo "SRC_TDJNI_LIBNAME=$SRC_TDJNI_LIBNAME" >> $GITHUB_ENV
echo "DEST_TDJNI_LIBNAME=$DEST_TDJNI_LIBNAME" >> $GITHUB_ENV echo "DEST_TDJNI_LIBNAME=$DEST_TDJNI_LIBNAME" >> $GITHUB_ENV
- name: Install latest CMake
if: matrix.os == 'windows-2019' - name: Install dependencies
uses: lukka/get-cmake@latest 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) - name: Restore artifacts, or setup vcpkg (do not install any package)
if: matrix.os == 'windows-2019' if: matrix.os == 'windows-2019'
uses: lukka/run-vcpkg@v7 uses: lukka/run-vcpkg@v7
@ -183,14 +188,6 @@ jobs:
run: | run: |
$VCPKG_DIR/vcpkg install gperf openssl:x64-windows-static zlib:x64-windows-static $VCPKG_DIR/vcpkg install gperf openssl:x64-windows-static zlib:x64-windows-static
shell: bash 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 - name: Build
if: matrix.usedocker == 'false' if: matrix.usedocker == 'false'
shell: bash shell: bash

10
scripts/continuous-integration/github-workflows/install-dependencies.sh
View File

@ -40,15 +40,15 @@ elif [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then
#echo "Done .tlo" #echo "Done .tlo"
elif [[ "$OPERATING_SYSTEM_NAME" == "windows" ]]; then elif [[ "$OPERATING_SYSTEM_NAME" == "windows" ]]; then
echo "==Windows==" echo "==Windows=="
#choco install ccache choco install ccache
#choco install make choco install make
#choco install windows-sdk-10.1 #choco install windows-sdk-10.1
#choco install visualstudio2019buildtools --version=16.10.4.0 --allow-downgrade --package-parameters "--passive" choco install visualstudio2019buildtools --version=16.10.4.0 --allow-downgrade --package-parameters "--passive"
#choco install visualstudio2019-workload-vctools choco install visualstudio2019-workload-vctools
#choco install openjdk11 --version=11.0.8.10 #choco install openjdk11 --version=11.0.8.10
choco install maven --version=3.8.2 --allow-downgrade choco install maven --version=3.8.2 --allow-downgrade
choco install base64 choco install base64
#choco install gperf choco install gperf
choco install strawberryperl choco install strawberryperl
choco install nasm choco install nasm
#choco install php --version=7.4.9 --package-parameters='"/ThreadSafe ""/InstallDir:C:\PHP"""' #choco install php --version=7.4.9 --package-parameters='"/ThreadSafe ""/InstallDir:C:\PHP"""'