Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates to fix broken CI tests #1250

Merged
merged 7 commits into from
Jul 16, 2024
Merged

Updates to fix broken CI tests #1250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7946765
Update ci_script.sh
lanctot Jul 16, 2024
94bff05
Update ci_script.sh
lanctot Jul 16, 2024
7a9e2b7
Update install.sh
lanctot Jul 16, 2024
dba1e25
Update install.sh
lanctot Jul 16, 2024
7d9ef7f
Update install.sh
lanctot Jul 16, 2024
cb2de2f
Update ci_script.sh
lanctot Jul 16, 2024
2478809
Update uci_bot.h
lanctot Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion open_spiel/bots/uci/uci_bot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#ifndef OPEN_SPIEL_BOTS_UCI_BOT_H_
#define OPEN_SPIEL_BOTS_UCI_BOT_H_

#include <cstdio> // for size_t, needed by ::getline
#include <map>
#include <memory>
#include <string>
Expand Down Expand Up @@ -97,7 +98,7 @@ class UCIBot : public Bot {
// Input stream member variables for the bot.
FILE* input_stream_ = nullptr;
char* input_stream_buffer_ = nullptr;
uint64_t input_stream_buffer_size_ = 0;
size_t input_stream_buffer_size_ = 0;
};

/**
Expand Down
4 changes: 1 addition & 3 deletions open_spiel/scripts/ci_script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ if [[ "$OS" = "Linux" && "$OS_PYTHON_VERSION" = "3.9" ]]; then
# Still needed to support using venv on Ubuntu 20.04:
sudo apt-get install python3.9-venv
elif [[ "$OS" = "Darwin" ]]; then
# MacOS uses Python 3.11 and PyTorch does not yet support Python 3.11. For now,
# install the specific versions we've requested on MacOS.
brew install python@${OS_PYTHON_VERSION}
# Python is already intalled via brew in install.sh from actions.yml
brew link --force python@${OS_PYTHON_VERSION}
fi

Expand Down
8 changes: 5 additions & 3 deletions open_spiel/scripts/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,12 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then # Mac OSX
[[ -x `which python3` ]] || brew install python3 || echo "** Warning: failed 'brew install python3' -- continuing"
# On Github Actions, macOS comes with Python 3.9.
# We want to test multiple Python versions determined by OS_PYTHON_VERSION.
if [[ "$CI" && "${OS_PYTHON_VERSION}" != "3.9" ]]; then
brew install "python@${OS_PYTHON_VERSION}"
if [[ "$CI" ]]; then
# Only install the python version if it's not present. There are issues otherwise.
if [[ `brew list python@${OS_PYTHON_VERSION}; echo $?` == 0 ]]; then
brew install "python@${OS_PYTHON_VERSION}"
fi
# Uninstall Python 3.9 if we need to.
brew list [email protected] && brew unlink [email protected]
brew link --force --overwrite "python@${OS_PYTHON_VERSION}"
fi
`python3 -c "import tkinter" > /dev/null 2>&1` || brew install tcl-tk || echo "** Warning: failed 'brew install tcl-tk' -- continuing"
Expand Down
Loading