Fix the hanabi configuration.

To prevent this from happening again, we checkout the most recent commit as of today.

PiperOrigin-RevId: 283739779
Change-Id: I1af0942a9b20a61102b3326b56387307563f0095

install.sh

@@ -62,7 +62,11 @@ fi
 # Optional dependencies.
 DIR="open_spiel/games/hanabi/hanabi-learning-environment"
 if [[ ${BUILD_WITH_HANABI:-"ON"} == "ON" ]] && [[ ! -d ${DIR} ]]; then
-  git clone -b 'master' --single-branch --depth 1 https://github.com/deepmind/hanabi-learning-environment.git ${DIR}
+  git clone -b 'master' --single-branch --depth 15 https://github.com/deepmind/hanabi-learning-environment.git ${DIR}
+  # We checkout a specific CL to prevent future breakage due to changes upstream
+  pushd ${DIR}
+  git checkout  'b31c973'
+  popd
 fi
 
 # The official https://github.com/ethansbrown/acpc was outdated so we forked it and updated it with

open_spiel/games/hanabi/CMakeLists.txt

@@ -1,29 +1,29 @@
 add_library(hanabi_learning_environment OBJECT
-  hanabi-learning-environment/hanabi_lib/canonical_encoders.cc
-  hanabi-learning-environment/hanabi_lib/canonical_encoders.h
-  hanabi-learning-environment/hanabi_lib/hanabi_card.cc
-  hanabi-learning-environment/hanabi_lib/hanabi_card.h
-  hanabi-learning-environment/hanabi_lib/hanabi_game.cc
-  hanabi-learning-environment/hanabi_lib/hanabi_game.h
-  hanabi-learning-environment/hanabi_lib/hanabi_hand.cc
-  hanabi-learning-environment/hanabi_lib/hanabi_hand.h
-  hanabi-learning-environment/hanabi_lib/hanabi_history_item.cc
-  hanabi-learning-environment/hanabi_lib/hanabi_history_item.h
-  hanabi-learning-environment/hanabi_lib/hanabi_move.cc
-  hanabi-learning-environment/hanabi_lib/hanabi_move.h
-  hanabi-learning-environment/hanabi_lib/hanabi_observation.cc
-  hanabi-learning-environment/hanabi_lib/hanabi_observation.h
-  hanabi-learning-environment/hanabi_lib/hanabi_state.cc
-  hanabi-learning-environment/hanabi_lib/hanabi_state.h
-  hanabi-learning-environment/hanabi_lib/observation_encoder.h
-  hanabi-learning-environment/hanabi_lib/util.cc
-  hanabi-learning-environment/hanabi_lib/util.h
+  hanabi-learning-environment/hanabi_learning_environment/hanabi_lib/canonical_encoders.cc
+  hanabi-learning-environment/hanabi_learning_environment/hanabi_lib/canonical_encoders.h
+  hanabi-learning-environment/hanabi_learning_environment/hanabi_lib/hanabi_card.cc
+  hanabi-learning-environment/hanabi_learning_environment/hanabi_lib/hanabi_card.h
+  hanabi-learning-environment/hanabi_learning_environment/hanabi_lib/hanabi_game.cc
+  hanabi-learning-environment/hanabi_learning_environment/hanabi_lib/hanabi_game.h
+  hanabi-learning-environment/hanabi_learning_environment/hanabi_lib/hanabi_hand.cc
+  hanabi-learning-environment/hanabi_learning_environment/hanabi_lib/hanabi_hand.h
+  hanabi-learning-environment/hanabi_learning_environment/hanabi_lib/hanabi_history_item.cc
+  hanabi-learning-environment/hanabi_learning_environment/hanabi_lib/hanabi_history_item.h
+  hanabi-learning-environment/hanabi_learning_environment/hanabi_lib/hanabi_move.cc
+  hanabi-learning-environment/hanabi_learning_environment/hanabi_lib/hanabi_move.h
+  hanabi-learning-environment/hanabi_learning_environment/hanabi_lib/hanabi_observation.cc
+  hanabi-learning-environment/hanabi_learning_environment/hanabi_lib/hanabi_observation.h
+  hanabi-learning-environment/hanabi_learning_environment/hanabi_lib/hanabi_state.cc
+  hanabi-learning-environment/hanabi_learning_environment/hanabi_lib/hanabi_state.h
+  hanabi-learning-environment/hanabi_learning_environment/hanabi_lib/observation_encoder.h
+  hanabi-learning-environment/hanabi_learning_environment/hanabi_lib/util.cc
+  hanabi-learning-environment/hanabi_learning_environment/hanabi_lib/util.h
 )
 
-target_include_directories (hanabi_learning_environment PUBLIC hanabi-learning-environment)
-target_include_directories (games PUBLIC hanabi-learning-environment)
+target_include_directories (hanabi_learning_environment PUBLIC hanabi-learning-environment/hanabi_learning_environment)
+target_include_directories (games PUBLIC hanabi-learning-environment/hanabi_learning_environment)
 
 add_executable(hanabi_test ../hanabi_test.cc ${OPEN_SPIEL_OBJECTS}
                $<TARGET_OBJECTS:tests>)
 add_test(hanabi_test hanabi_test)
-target_include_directories (hanabi_test PUBLIC hanabi-learning-environment)
+target_include_directories (hanabi_test PUBLIC hanabi-learning-environment/hanabi_learning_environment)