Skip to content

Commit

Permalink
Merge pull request #1200 from google-deepmind:lanctot-v1.5-nodejsfix
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 622819747
Change-Id: Iea077aefb0ce4fec123054f9a94062388f1a373f
  • Loading branch information
lanctot committed Apr 8, 2024
2 parents eb18a3b + 4450ce6 commit 62ee37c
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,15 @@ jobs:
BUILD_SHARED_LIB: "OFF"
OPEN_SPIEL_BUILD_WITH_ORTOOLS: "OFF"
OPEN_SPIEL_BUILD_WITH_ORTOOLS_DOWNLOAD_URL: ""
- os: macos-13
OS_PYTHON_VERSION: "3.11"
TRAVIS_USE_NOX: 0
DEFAULT_OPTIONAL_DEPENDENCY: "OFF"
BUILD_SHARED_LIB: "OFF"
OPEN_SPIEL_BUILD_WITH_ORTOOLS: "OFF"
OPEN_SPIEL_BUILD_WITH_ORTOOLS_DOWNLOAD_URL: ""
# Standard or older platforms with older Python versions.
# Older Python version on Ubuntu 20.04
- os: macos-12
OS_PYTHON_VERSION: "3.9"
TRAVIS_USE_NOX: 0
Expand Down Expand Up @@ -65,8 +74,8 @@ jobs:
OPEN_SPIEL_BUILD_WITH_ORTOOLS_DOWNLOAD_URL: ${{ matrix.OPEN_SPIEL_BUILD_WITH_ORTOOLS_DOWNLOAD_URL }}

steps:
- uses: actions/checkout@v3
- uses: julia-actions/setup-julia@v1
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v2
with:
version: 1.8
- name: Ad-hoc fix
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
CIBW_ENVIRONMENT: ${{ matrix.CIBW_ENVIRONMENT }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install
run: |
Expand Down Expand Up @@ -114,8 +114,9 @@ jobs:
- name: Install bdist_wheel and full tests
run: ./open_spiel/scripts/test_wheel.sh full `pwd` ${CI_PYBIN}

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: artifact-${{ matrix.os }}
path: |
dist/*.tar.gz
./wheelhouse/*.whl
5 changes: 2 additions & 3 deletions open_spiel/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,8 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then # Mac OSX
cargo install bindgen-cli
fi
fi

curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
${PYBIN} get-pip.py
# Removed getting pip via git-pip.py. See #1200.
# brew install virtualenv # May be the required way to do this as of Python 3.12?
${PYBIN} -m pip install virtualenv
else
echo "The OS '$OSTYPE' is not supported (Only Linux and MacOS is). " \
Expand Down

0 comments on commit 62ee37c

Please sign in to comment.