aboutsummaryrefslogtreecommitdiffstats
path: root/appveyor.yml
AgeCommit message (Collapse)AuthorFilesLines
2019-02-11appveyor: upload installer artifacts for development branchesPeter Wu1-9/+6
Manually configuring the artifacts at the configuration page does not work, so let's make artifact uploads automatic again. It was previously disabled because Dario triggers a lot of builds due to mirroring master. That issue is now resolved by limiting uploads to other branches. Change-Id: Id7522c1890ec749b73f9ee16ddbe76a363235663 Reviewed-on: https://code.wireshark.org/review/31962 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-01-15make-version.pl updates.Gerald Combs1-3/+1
Read our major, minor, and micro versions from CMakeLists.txt. Add the ability to set our extra version information differently if our Git commit is tagged or untagged. Change our extra version placeholder from "%#" to "{vcsinfo}". Add --tagged-version-extra (-t) and --untagged-version-extra (-u) arguments for specifying the tagged and untagged extra formats. Add --force-extra (-f) so that we can force one format or the other. Require the major.minor.micro version to be specified when using --set-version (-v). Update appveyor.yml and the Developer's Guide to match the new behavior. Change-Id: I6e5d55470aff7e7c61e75f208e24c4105276905a Reviewed-on: https://code.wireshark.org/review/31479 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-01-10Move make-version.pl to tools.Gerald Combs1-1/+1
Move make-version.pl to the tools directory. Change-Id: I7c3ec8951a682d45d650e3fdb1580d90bf19e8b4 Reviewed-on: https://code.wireshark.org/review/31473 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-05test: enable parallelism by default for pytestPeter Wu1-1/+1
Consistent with tools like "ninja", enable parallelism by default. It can be disabled again with `pytest -n0`. This makes pytest-xdist a dependency when pytest is used as test runner. This does not affect the unittest-based test runnet (test/test.py). Change-Id: I4dc905f097c57a869aa39487b15361502b431616 Reviewed-on: https://code.wireshark.org/review/31371 Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-05test: allow running pytest without specifying the tests directoryPeter Wu1-1/+1
This allows `pytest` to be executed from the top-level source or build directory (or any other directory below). Change-Id: Ib7af2ea2aaf01319d6839d2dc67228fbb5a7bc34 Reviewed-on: https://code.wireshark.org/review/31370 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-04test: assume binaries in $PWD\run\RelWithDebInfo by defaultPeter Wu1-1/+0
Avoid the need to set `pytest --program-path` in the common case. Change-Id: I3b237e47eee741decb62a74b733110040aa26673 Reviewed-on: https://code.wireshark.org/review/31348 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-29Add support for RSA decryption using PKCS #11 tokensPeter Wu1-0/+3
Add support for loading RSA private key files from PKCS #11 tokens, identified by PKCS #11 URIs. Add a new 'pkcs11_libs' UAT which can dynamically load PKCS #11 provider libraries that are not found by p11-kit. The configuration GUI will need additional code to discover available PKCS #11 tokens and will be added later. This feature requires GnuTLS 3.4 with PKCS #11 support, so Windows, macOS via Homebrew, Ubuntu 16.04, Debian Stretch. Not supported: RHEL7. Currently macOS via official packages disables PKCS #11 support, so that will also not work. Change-Id: I20646bfd69c6bd13c8c2d27cb65c164a4b0b7a66 Reviewed-on: https://code.wireshark.org/review/30855 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-19test: enable extra test summary by defaultPeter Wu1-1/+1
This reports the reason why tests are skipped (for example, if a certain binary was not built). Change-Id: I19095f43f69228116d71b52380814a61894754af Reviewed-on: https://code.wireshark.org/review/31131 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-14travis,appveyor: display tshark --version outputPeter Wu1-0/+5
This reveals the actual build configuration. Change-Id: Ie49cea4a07faaa1b942ff6a973b03893f36ca16f Reviewed-on: https://code.wireshark.org/review/31043 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-10-21appveyor: comment out artifacts upload due to size too large.Dario Lombardo1-2/+6
Change-Id: I9f4bb3f32fcac39f0d087cbd5e5397306d8800e1 Reviewed-on: https://code.wireshark.org/review/30268 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-08-20appveyor.yml: add integration with AppVeyor CIPeter Wu1-0/+64
Many dependencies (Git, MSVC2015, etc.) are already installed. The only missing ones are HTMLHelp and Doxygen, but these are not used. The AppVeyor free plan has one concurrent job with 2 cores, starting with the first item in the test matrix. As everyone likely develops on 64-bit, 32-bit is more likely to break, thus prioritize it for VS2015. For testing artifacts, do create a VS2017 x64 build before that though. Cloning git and installing deps takes about 2-3 minutes. cmake takes 2-3 minutes. Wireshark.sln and test-programs build in about 11-12 minutes, tests run in about 3 minutes, nsis packages in 3-4 minutes. A single job takes 21-28 minutes (depending on environment). Change-Id: If0c738743ce3ccd7ddfb5d9e77cdb2d3a5354ac7 Reviewed-on: https://code.wireshark.org/review/28967 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>