Revert "Update VAL installation instructions (#87)"

This reverts commit 931ce80. The new VAL version stumbles over ?after variable names in data-network.
aibasel · Jul 17, 2020 · d78fdf8 · d78fdf8
1 parent e6c7416
commit d78fdf8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -74,12 +74,16 @@ jobs:
     - name: Compile VAL
       working-directory: ../deps
       run: |
-        sudo apt-get -y install bison cmake flex g++ make
+        sudo apt-get -y install g++ make flex bison
         git clone https://github.com/KCL-Planning/VAL.git
         cd VAL
-        git checkout 8d61593  # Newer versions require time stamps (https://github.com/KCL-Planning/VAL/issues/46).
-        bash scripts/linux/build_linux64.sh all release
-        ln -s `realpath build/linux64/release/bin/Validate` ../validate
+        git checkout a5565396007eee73ac36527fbf904142b3077c74
+        make clean  # Remove old build artifacts and binaries.
+        sed -i 's/-Werror //g' Makefile  # Ignore warnings.
+        make -j
+        mv validate ../
+        cd ../
+        rm -rf VAL
 
     - name: Clone benchmarks
       working-directory: ../deps

diff --git a/docs/downward.tutorial.rst b/docs/downward.tutorial.rst
@@ -46,13 +46,16 @@ Install VAL
 
 ::
 
-    sudo apt install bison cmake flex g++ make
+    sudo apt install g++ make flex bison
     git clone https://github.com/KCL-Planning/VAL.git
     cd VAL
-    git checkout 8d61593  # Newer versions are incompatible with Fast Downward.
-    bash scripts/linux/build_linux64.sh all release
-    # Add binary to a directory on PATH.
-    sudo ln -s `realpath build/linux64/release/bin/Validate` /usr/local/bin/validate
+    # Newer VAL versions need time stamps, so we use an old version
+    # (https://github.com/KCL-Planning/VAL/issues/46).
+    git checkout a5565396007eee73ac36527fbf904142b3077c74
+    make clean  # Remove old binaries.
+    sed -i 's/-Werror //g' Makefile  # Ignore warnings.
+    make
+    sudo cp validate /usr/local/bin  # Add binary to a directory on PATH.
 
 
 Run tutorial experiment

diff --git a/docs/news.rst b/docs/news.rst
@@ -18,7 +18,6 @@ Downward Lab
 * Gracefully handle empty scatter plots (Jendrik Seipp).
 * Make ``score_*`` attributes absolute, i.e., include tasks for which not all algorithms
   have a value in aggregations (Jendrik Seipp).
-* Update VAL installation instructions (Silvan Sievers).
 
 
 v6.0 (2020-04-05)