Merge branch 'master' of https://github.com/mojamil/einsteintoolkit

mojamil · Sep 17, 2020 · 8f96e49 · 8f96e49
2 parents a3f3732 + 09b996a
commit 8f96e49
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,6 +24,18 @@ jobs:
           fetch-depth: 0
           ref: "gh-pages"
 
+      - name: Install pre-requisite libraries
+        run: $(sudo -l sudo) su -c 'apt-get install -y subversion gcc git numactl libgsl-dev libpapi-dev python libhwloc-dev libudev-dev make libopenmpi-dev libhdf5-openmpi-dev libfftw3-dev libssl-dev liblapack-dev g++ curl gfortran patch pkg-config libhdf5-dev libjpeg-turbo?-dev'
+
+      - name: Restore cached files
+        uses: actions/cache@v2.1.1
+        with:
+          path: ./
+          key: ${{ runner.os }}-build-${{ env.cache-name }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
       # Runs a set of commands using the runners shell
       - name: Run build and test script
         run: |
@@ -36,11 +48,9 @@ jobs:
         run: |
           git config --local user.email "msj2340@gmail.com"
           git config --local user.name "mojamil"
-          git commit -m "updated html file"
+          git commit -m "updated html file" || true
       - name: Push changes
         uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           branch: "gh-pages"
-
-
diff --git a/build-and-test.sh b/build-and-test.sh
@@ -33,7 +33,7 @@ if [ -r $WORKSPACE/configs/sim ]; then
 fi
 time $WORKSPACE/cactusjenkins/build-cactus manifest/einsteintoolkit.th
 sed -i '2a export WORKSPACE=$PWD ' cactusjenkins/test-cactus
-sed -i '2a export JOB_NAME="TestJob00" ' cactusjenkins/test-cactus
+sed -i '2a export JOB_NAME="TestJob01" ' cactusjenkins/test-cactus
 time $WORKSPACE/cactusjenkins/test-cactus all
 python3 $WORKSPACE/logpage.py
 python3 $WORKSPACE/mail.py
@@ -42,4 +42,4 @@ python3 $WORKSPACE/mail.py
 #time $WORKSPACE/cactusjenkins/build-cactus-doc
 
 #cd $WORKSPACE/repos/carpet
-#doxygen
+#doxygen