diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50bbd81c47f1e57fbddd9364e4b84ac9877b2864..fc5f96e7ab66f96b731710fda88659b0703256d1 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/base/Dockerfile b/base/Dockerfile index 03d05305b1ba6b1156afc5789bc3165b0b27f9c2..eb9678d84e8c7e4c38d404e73e7ee28403a10cb4 100644 --- a/base/Dockerfile +++ b/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 diff --git a/base/verbose-git-status b/base/verbose-git-status new file mode 100755 index 0000000000000000000000000000000000000000..eb88ecb62ba303891ec5e6925fb4875d33cab136 --- /dev/null +++ b/base/verbose-git-status @@ -0,0 +1,12 @@ +#!/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" diff --git a/bin/verbose-git-status b/bin/verbose-git-status deleted file mode 100755 index 18ea239449d59a23bc35f74820fc815560390837..0000000000000000000000000000000000000000 --- a/bin/verbose-git-status +++ /dev/null @@ -1,14 +0,0 @@ -#!/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