diff options
| author | Gerald Combs <gerald@wireshark.org> | 2020-09-07 09:22:01 -0700 |
|---|---|---|
| committer | AndersBroman <a.broman58@gmail.com> | 2020-09-07 19:35:45 +0000 |
| commit | 322f6f3988d3707114f2856dac8108e30eacaa81 (patch) | |
| tree | ef0048321e20ff1f03b9bad13f6dcb7be73bc28e /.editorconfig | |
| parent | 5a874c5796d487054a3f562379731720931340d3 (diff) | |
GitLab CI: Restrict the Windows build to wireshark/wireshark.
The Windows runners are constrained by the following:
* We require quite a bit of software not present in the stanadard
runner[1] which takes a long time to install, including Python, Perl,
and Qt.
* You can't specify an arbitrary Docker image like you can with Linux
runners.
As a result we have a project-specific runner for wireshark/wireshark
that runs a custom Windows Docker image. Update the CI rules so that
merge-request:windows only runs for gitlab.com/wireshark/wireshark. The
GitLab documentation recommends rules over only/except, so switch to
them.
Fixup .editorconfig while we're here.
[1]https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/gcp/windows-containers/blob/master/cookbooks/preinstalled-software/README.md
Diffstat (limited to '.editorconfig')
| -rw-r--r-- | .editorconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.editorconfig b/.editorconfig index 0394fbb1bc..78d03d0157 100644 --- a/.editorconfig +++ b/.editorconfig @@ -40,7 +40,7 @@ indent_style = space indent_size = 2 # YAML -[*.{yml}] +[*.yml] indent_style = space indent_size = 2 |