[glib-networking/mcatanzaro/ci] Update CI to use glib 2.65.2
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking/mcatanzaro/ci] Update CI to use glib 2.65.2
- Date: Wed, 26 Aug 2020 00:31:00 +0000 (UTC)
commit f7953859e36976e37a3af2da9cd1f44ed2e06c13
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Tue Aug 25 18:22:51 2020 -0500
Update CI to use glib 2.65.2
.gitlab-ci.yml | 8 ++++----
.gitlab-ci/run-docker.sh | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 37255e5..a48908e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/glib-networking/master:v12
+image: registry.gitlab.gnome.org/gnome/glib-networking/master:v14
fedora-x86_64:
stage: build
@@ -10,7 +10,7 @@ fedora-x86_64:
-Dgnome_proxy=enabled
-Dwerror=true
_build/
- - ninja -C _build/
+ - meson compile -C _build/
- meson test -v -C _build/ --repeat=500
- meson install -C _build/
artifacts:
@@ -29,7 +29,7 @@ fedora-x86_64-asan:
-Dgnome_proxy=enabled
-Dwerror=true
_build/
- - ninja -C _build/
+ - meson compile -C _build/
- ASAN_OPTIONS=fast_unwind_on_malloc=0 meson test --verbose --timeout-multiplier=10 -C _build/
artifacts:
paths:
@@ -45,7 +45,7 @@ fedora-x86_64-scan-build:
-Dgnome_proxy=enabled
-Dwerror=true
_build/
- - ninja -C _build/ scan-build
+ - scan-build meson compile -C _build/
- bash -c 'if [[ -n "$(ls -A _build/meson-logs/scanbuild/)" ]]; then echo "Scan build log found,
assuming defects exist"; exit 1; fi'
artifacts:
paths:
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 4428417..117f344 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,7 +2,7 @@
set -e
-TAG="registry.gitlab.gnome.org/gnome/glib-networking/master:v12"
+TAG="registry.gitlab.gnome.org/gnome/glib-networking/master:v14"
cd "$(dirname "$0")"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]