summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2023-05-16 11:01:27 +0000
committerSimon McVittie <smcv@collabora.com>2023-05-16 11:01:27 +0000
commita6654eae7f842ee9fd94cafb6ce1ffd98df2bdf5 (patch)
treee358d39a05e4e6692aa239977e76a58ab4b80fce
parent20c1eb52163621f950940e424c1773c6eb4512d4 (diff)
parentd994f85f4db91a3dec285d47b9d4e067cc7ca2a0 (diff)
downloaddbus-master.tar.gz
Merge branch 'wip/smcv/reinstate-windows-ci' into 'master'HEADmaster
Revert "CI: Disable native Windows builds for now" Closes #456 See merge request dbus/dbus!406
-rw-r--r--.gitlab-ci.yml4
1 files changed, 0 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5dd5782..abe77317 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -130,8 +130,6 @@ windows amd64 image:
echo "Failed to build the image"
Exit 1
}
- # This is extremely slow, and is getting in the way of having CI at all
- when: manual
.unix-host-build:
stage: build
@@ -353,8 +351,6 @@ ubuntu jammy autotools:
- $WarningPreference = "Stop"
- $env:DBUS_TEST_MALLOC_FAILURES = 0
- $env:PATH += ";C:\bin"
- # These are extremely slow, and are getting in the way of having CI at all
- when: manual
windows msys64 ucrt64 cmake:
extends: .win-build