[!53] Really report repository ids

Merge branch 'really-report-repo-ids' into 'master'

And make the script for that available.

Closes: [#11]

See merge request [joe/pacxx-docker!53]

  [#11]: gitlab.dune-project.org/joe/pacxx-docker/issues/11
  [joe/pacxx-docker!53]: gitlab.dune-project.org/joe/pacxx-docker/merge_requests/53


Closes #11

.gitlab-ci.yml

@@ -115,17 +115,19 @@ pacxx-source:
   - mkdir src
   - cd src
   - git clone --depth=1 https://zivgitlab.uni-muenster.de/HPC2SE-Project/pacxx-llvm2.git .
-  - ../bin/verbose-git-status . llvm-wrapper-repo 2>&1 | tee -a repoversions
+  - verbose-git-status . llvm-wrapper-repo >>../repoversions
   - ./reinit
-  - ../bin/verbose-git-status . llvm 2>&1 | tee -a repoversions
+  - verbose-git-status . llvm >>../repoversions
   - git clone --depth=1 https://zivgitlab.uni-muenster.de/HPC2SE-Project/pacxx-clang.git tools/clang
-  - ../bin/verbose-git-status tools/clang clang 2>&1 | tee -a repoversions
+  - verbose-git-status tools/clang clang >>../repoversions
   - git clone --depth=1 https://zivgitlab.uni-muenster.de/HPC2SE-Project/pacxx-rv2.git tools/rv
-  - ../bin/verbose-git-status tools/rv rv-wrapper-repo 2>&1 | tee -a repoversions
+  - verbose-git-status tools/rv rv-wrapper-repo >>../repoversions
   - (cd tools/rv && ./reinit)
-  - ../bin/verbose-git-status tools/rv rv 2>&1 | tee -a repoversions
+  - verbose-git-status tools/rv rv >>../repoversions
   - git clone --depth=1 https://zivgitlab.uni-muenster.de/HPC2SE-Project/pacxx-runtime.git projects/pacxxrt
-  - ../bin/verbose-git-status projects/pacxxrt pacxx-runtime 2>&1 | tee -a repoversions
+  - verbose-git-status projects/pacxxrt pacxx-runtime >>../repoversions
+  - mv ../repoversions ./
+  - cat repoversions
   artifacts:
     paths:
     - src/
@@ -146,12 +148,14 @@ pacxx-build-native:
   variables:
     GIT_STRATEGY: none
   script:
+  - cat src/repoversions
   - mkdir build
   - cd build
   - cmake ../src -DBUILD_SHARED_LIBS=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_ENABLE_CXX1Y=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS_RELEASE="-O3" -DCMAKE_INSTALL_PREFIX=/opt/pacxx
   - make -j$(nproc)
   - cd ..
   - make DESTDIR=$(pwd) -C build -j$(nproc) install
+  - cp src/repoversions opt/pacxx/
   artifacts:
     paths:
     - opt/pacxx/
@@ -167,12 +171,14 @@ pacxx-build-cuda:
   variables:
     GIT_STRATEGY: none
   script:
+  - cat src/repoversions
   - mkdir build
   - cd build
   - cmake ../src -DBUILD_SHARED_LIBS=ON -DLLVM_ENABLE_RTTI=ON -DLLVM_ENABLE_CXX1Y=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS_RELEASE="-O3" -DCMAKE_INSTALL_PREFIX=/opt/pacxx
   - make -j$(nproc)
   - cd ..
   - make DESTDIR=$(pwd) -C build -j$(nproc) install
+  - cp src/repoversions opt/pacxx/
   artifacts:
     paths:
     - opt/pacxx/
@@ -189,6 +195,7 @@ pacxx-native:
   dependencies:
   - pacxx-build-native
   script:
+  - cat opt/pacxx/repoversions
   - docker load -i /cache/docker-cache.tar || true
   - mv opt pacxx/
   - docker pull "$JOB_REPO.$PIPELINE_TAG" || true
@@ -208,6 +215,7 @@ pacxx-cuda:
   dependencies:
   - pacxx-build-cuda
   script:
+  - cat opt/pacxx/repoversions
   - docker load -i /cache/docker-cache.tar || true
   - mv opt pacxx/
   - docker pull "$JOB_REPO.$PIPELINE_TAG" || true
@@ -227,6 +235,7 @@ pacxx-perftest-2.6:
   dependencies:
   - pacxx-build-native
   script:
+  - cat opt/pacxx/repoversions
   - docker load -i /cache/docker-cache.tar || true
   - docker pull "$JOB_REPO.$PIPELINE_TAG" || true
   - docker pull "$JOB_REPO.$CI_COMMIT_REF_SLUG" || true
@@ -264,6 +273,7 @@ test-native-make-debug:
     GIT_STRATEGY: none
     PACXX_DEFAULT_RT: 1 # native
   script:
+  - cat /opt/pacxx/repoversions
   - export PATH=/opt/pacxx/bin:$PATH
   - git clone --depth=1 https://zivgitlab.uni-muenster.de/HPC2SE-Project/pacxx-samples.git samples
   - (cd samples && git fetch --depth=1 origin "$CI_COMMIT_REF_NAME" && git checkout "$CI_COMMIT_REF_NAME") || true
@@ -286,6 +296,7 @@ test-cuda-make-release:
     GIT_STRATEGY: none
     PACXX_DEFAULT_RT: 0 # Cuda
   script:
+  - cat /opt/pacxx/repoversions
   - export PATH=/opt/pacxx/bin:$PATH
   - git clone --depth=1 https://zivgitlab.uni-muenster.de/HPC2SE-Project/pacxx-samples.git samples
   - (cd samples && git fetch --depth=1 origin "$CI_COMMIT_REF_NAME" && git checkout "$CI_COMMIT_REF_NAME") || true
@@ -306,6 +317,7 @@ test-native-ninja-release:
     GIT_STRATEGY: none
     PACXX_DEFAULT_RT: 1 # native
   script:
+  - cat /opt/pacxx/repoversions
   - export PATH=/opt/pacxx/bin:$PATH
   - git clone --depth=1 https://zivgitlab.uni-muenster.de/HPC2SE-Project/pacxx-samples.git samples
   - (cd samples && git fetch --depth=1 origin "$CI_COMMIT_REF_NAME" && git checkout "$CI_COMMIT_REF_NAME") || true

base/Dockerfile

@@ -34,6 +34,8 @@ RUN set -ex;                                            \
 ENV CCACHE_DIR=/cache/ccache
 ENV PATH=/usr/lib/ccache:$PATH
 
+COPY --chown=root:root verbose-git-status /usr/local/bin/
+
 RUN adduser --disabled-password --home /ci --uid 50000 --gecos "" ci
     
 USER ci

base/verbose-git-status

+#!/bin/sh
+
+# verbose-git-status DIR NAME
+
+dir=${1:?Need a directory to report status for}
+name=${2:?Need a project name to report}
+
+remote=$(git -C "$dir" remote get-url origin)
+branch=$(git -C "$dir" symbolic-ref -q --short HEAD)
+commit=$(git -C "$dir" rev-parse HEAD)
+
+echo "Project $name in $dir: on branch ${branch:-(detached)} at $commit from $remote"

bin/verbose-git-status

-#!/bin/sh
-
-# verbose-git-status DIR NAME
-
-dir=${1:?Need a directory to report status for}
-name=${2:?Need a repository name to report}
-
-echo "Status for $name in $dir:"
-echo "Remotes:"
-git -C "$dir" remote -v
-echo "Top commit:"
-git -C "$dir" log -n1
-echo "Status:"
-git -C "$dir" status