From 2ded1d08516c55297f75d303f4947ddeb89318c2 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Sun, 12 Sep 2021 22:01:45 +0200
Subject: [PATCH] CI wrench: use an external script

---
 .github/workflows/ci-wrench.yml | 21 +--------------------
 tools/jenkins/ci-wrench.sh      | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 20 deletions(-)
 create mode 100644 tools/jenkins/ci-wrench.sh

diff --git a/.github/workflows/ci-wrench.yml b/.github/workflows/ci-wrench.yml
index 53f6f382cc..3668f1346f 100644
--- a/.github/workflows/ci-wrench.yml
+++ b/.github/workflows/ci-wrench.yml
@@ -13,29 +13,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Install APT dependencies
-        run: |
-          apt update
-          apt -y install cmake
-          apt -y install gcc
-          apt -y install g++
-          apt -y install unzip
-          apt -y install doxygen
-          apt -y install wget
-          apt -y install git
-          apt -y install libboost-all-dev
-          apt -y install libpugixml-dev
-          apt -y install nlohmann-json3-dev
-      - name: Install googletest
-        run: |
-          wget https://github.com/google/googletest/archive/release-1.8.0.tar.gz
-          tar xf release-1.8.0.tar.gz
-          cd googletest-release-1.8.0/googletest && cmake . && make install
       - name: Build and test WRENCH
         run: |
           set -e
-          rm -rf wrench.git && git clone --depth 1 --branch simgrid-external-project-ci https://github.com/wrench-project/wrench.git wrench.git
-          mkdir wrench.git/build && cd wrench.git/build && cmake -DSIMGRID_INSTALL_PATH=/usr/ .. && make unit_tests && ./unit_tests
+          ./tools/jenkins/ci-wrench.sh
 
       - name: Create the failure Message
         if: ${{ failure() }}
diff --git a/tools/jenkins/ci-wrench.sh b/tools/jenkins/ci-wrench.sh
new file mode 100644
index 0000000000..7fdb5b4f30
--- /dev/null
+++ b/tools/jenkins/ci-wrench.sh
@@ -0,0 +1,29 @@
+export CXX="g++"
+export CC="gcc"
+export SUDO=""
+
+# Update refs, just in case
+$SUDO apt-get update
+
+# Install basic tools
+$SUDO apt-get -y install cmake
+$SUDO apt-get -y install gcc
+$SUDO apt-get -y install g++
+$SUDO apt-get -y install unzip
+$SUDO apt-get -y install doxygen
+$SUDO apt-get -y install wget
+$SUDO apt-get -y install git
+$SUDO apt-get -y install libboost-all-dev
+$SUDO apt-get -y install libpugixml-dev
+$SUDO apt-get -y install nlohmann-json3-dev
+
+# install googletest
+wget https://github.com/google/googletest/archive/release-1.8.0.tar.gz && tar xf release-1.8.0.tar.gz && cd googletest-release-1.8.0/googletest && cmake . && make && $SUDO make install && cd ../.. && rm -rf release-1.8.0.tar.gz googletest-release-1.8.0
+
+set -e
+# install WRENCH from their upstream git into the wrench.git directory
+rm -rf wrench.git && git clone --depth 1 --branch simgrid-external-project-ci https://github.com/wrench-project/wrench.git wrench.git
+(mkdir wrench.git/build && cd wrench.git/build && cmake -DSIMGRID_INSTALL_PATH=/usr/ .. && make unit_tests && ./unit_tests && cd ../.. && rm -rf wrench.git) || exit 1
+
+
+
-- 
2.20.1