diff options
| -rw-r--r-- | .gitlab-ci.yml | 20 | ||||
| -rwxr-xr-x | deps/makedeps.sh | 2 | ||||
| -rw-r--r-- | deps/sha512.chksms | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bac6eca..05cb3ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ makedeps: - deps/build.log stage: deps only: - - master + - main makedeps-again: script: @@ -38,7 +38,7 @@ makedeps-again: - deps/build.log stage: deps only: - - master + - main when: manual allow_failure: true @@ -54,7 +54,7 @@ build: - bin/ stage: build only: - - master + - main dependencies: - makedeps @@ -70,7 +70,7 @@ build-debug: - bin/ stage: build only: - - master + - main dependencies: - makedeps @@ -86,7 +86,7 @@ build-release: - bin/ stage: build only: - - master + - main dependencies: - makedeps @@ -119,7 +119,7 @@ tests-debug: - kill -SIGKILL ${XVFB_PID} stage: test-wine only: - - master + - main dependencies: - build-debug @@ -152,7 +152,7 @@ tests-release: - kill -SIGKILL ${XVFB_PID} stage: test-wine only: - - master + - main dependencies: - build-release @@ -165,7 +165,7 @@ tests-host-tools: - echo 'import sys, imp; mod = imp.load_dynamic("pycrypt", "bin/pycrypt"); print mod; mod.info()' | deps/sysroot/bin/python2.7 stage: test-host only: - - master + - main dependencies: - build-release @@ -179,7 +179,7 @@ tests-release-mdk: - pwd stage: test-wine only: - - master + - main dependencies: - build-release @@ -193,7 +193,7 @@ tests-debug-mdk: - pwd stage: test-wine only: - - master + - main dependencies: - build-debug diff --git a/deps/makedeps.sh b/deps/makedeps.sh index 6812471..12b0d39 100755 --- a/deps/makedeps.sh +++ b/deps/makedeps.sh @@ -72,7 +72,7 @@ export NASM=nasm-2.12.02 #export TOR=tor-0.3.0.9 export PKGCONFIG=pkg-config-0.29.2 export OPENSSL=openssl-1.1.1f -export ZLIB=zlib-1.2.12 +export ZLIB=zlib-1.2.13 export LIBEVENT=libevent-2.1.8-stable export BUILDDIRS="build_python build_binutils build_gcc build_musl build_tor build_mingw_binutils build_mingw_hdr build_mingw_crt build_mingw_gcc build_nasm build_mingw_winpthread build_pkgconfig build_mingw_openssl build_mingw_zlib build_mingw_libevent build_mingw_tor" diff --git a/deps/sha512.chksms b/deps/sha512.chksms index 74059a7..14dd78d 100644 --- a/deps/sha512.chksms +++ b/deps/sha512.chksms @@ -8,6 +8,6 @@ a6b52e7166c7cf2cdce383f7e8d67fd399b8736ce41ac7431b7fbcce8779601f847e9c36878c1724 03f1c97380cec892f2c465f7e3e3c99a55b5a7b7b966f71fba9398940ed332b7d960770ce75fafe549feaa70636edbf94b48b848137c9df3b0c8adb1dcbb1394 nasm-2.12.02.tar.gz 4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75 pkg-config-0.29.2.tar.gz b00bd9b5ad5298fbceeec6bb19c1ab0c106ca5cfb31178497c58bf7e0e0cf30fcc19c20f84e23af31cc126bf2447d3e4f8461db97bafa7bd78f69561932f000c openssl-1.1.1f.tar.gz -cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14 zlib-1.2.12.tar.gz +99f0e843f52290e6950cc328820c0f322a4d934a504f66c7caa76bd0cc17ece4bf0546424fc95135de85a2656fed5115abb835fd8d8a390d60ffaf946c8887ad zlib-1.2.13.tar.gz a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17 libevent-2.1.8-stable.tar.gz 24d3cb349d07a7f2f75c78593416470293d8027eee91ef8547a667222ed9ad91fc3d16a127a1988eefff3878accdf070c1b3aaff4e185dcb79503d8146f15b05 isl-0.20.tar.gz |