summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-05-05 16:22:32 -0400
committerMatthias Clasen <mclasen@redhat.com>2021-05-05 16:22:32 -0400
commitde056a3319151f7e7e7183057ed4e0815daa3b8b (patch)
tree32c65e613e0cdd5e60c4e0c78b9895028acf6757
parentbafa23fa2ccbaddbaf7235a63c0fca72fc64c461 (diff)
downloadgtk+-de056a3319151f7e7e7183057ed4e0815daa3b8b.tar.gz
ci: Show OS release for our containers
-rw-r--r--.gitlab-ci.yml5
-rwxr-xr-x.gitlab-ci/show-info-linux.sh5
-rwxr-xr-x.gitlab-ci/show-info-osx.sh (renamed from .gitlab-ci/show-execution-environment.sh)0
3 files changed, 9 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9bb30b979d..6b863c5507 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -77,6 +77,7 @@ fedora-x86_64:
variables:
EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
script:
+ - .gitlab-ci/show-info-linux.sh
- meson subprojects update
- meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
_build
@@ -92,6 +93,7 @@ release-build:
variables:
EXTRA_MESON_FLAGS: "--buildtype=release"
script:
+ - .gitlab-ci/show-info-linux.sh
- meson subprojects update
- meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
_build
@@ -106,6 +108,7 @@ installed-tests:
EXTRA_MESON_FLAGS: "--prefix=/usr --libdir=/usr/lib64 -Dinstall-tests=true"
G_TEST_ACCESSIBLE: 1
script:
+ - .gitlab-ci/show-info-linux.sh
- meson subprojects update
- meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
_build
@@ -155,7 +158,7 @@ macos:
- macos
needs: []
before_script:
- - bash .gitlab-ci/show-execution-environment.sh
+ - bash .gitlab-ci/show-info-osx.sh
- pip3 install --user meson==0.56
- pip3 install --user ninja
- export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
diff --git a/.gitlab-ci/show-info-linux.sh b/.gitlab-ci/show-info-linux.sh
new file mode 100755
index 0000000000..b0d9ff317e
--- /dev/null
+++ b/.gitlab-ci/show-info-linux.sh
@@ -0,0 +1,5 @@
+#! /bin/sh
+
+. /etc/os-release
+
+echo $PRETTY_NAME
diff --git a/.gitlab-ci/show-execution-environment.sh b/.gitlab-ci/show-info-osx.sh
index cc1bfdb87d..cc1bfdb87d 100755
--- a/.gitlab-ci/show-execution-environment.sh
+++ b/.gitlab-ci/show-info-osx.sh