[gtk/update-ci-to-f34] ci: Show OS release for our containers



commit de056a3319151f7e7e7183057ed4e0815daa3b8b
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed May 5 16:22:32 2021 -0400

    ci: Show OS release for our containers

 .gitlab-ci.yml                                                 | 5 ++++-
 .gitlab-ci/show-info-linux.sh                                  | 5 +++++
 .gitlab-ci/{show-execution-environment.sh => show-info-osx.sh} | 0
 3 files changed, 9 insertions(+), 1 deletion(-)
---
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
similarity index 100%
rename from .gitlab-ci/show-execution-environment.sh
rename to .gitlab-ci/show-info-osx.sh


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]