From 18d8dec7e55effe896c5abf943876bd4a7157010 Mon Sep 17 00:00:00 2001 From: Marc Lanctot Date: Sat, 6 Apr 2024 15:01:42 -0230 Subject: [PATCH 1/8] Upgrade checkout and upload-artifcat to v4 --- .github/workflows/actions.yml | 2 +- .github/workflows/wheels.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index c03c799ad4..f1d900699a 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -81,7 +81,7 @@ jobs: OPEN_SPIEL_BUILD_WITH_ORTOOLS_DOWNLOAD_URL: ${{ matrix.OPEN_SPIEL_BUILD_WITH_ORTOOLS_DOWNLOAD_URL }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: julia-actions/setup-julia@v1 with: version: 1.8 diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index ab1da17743..93e7cd668b 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -68,7 +68,7 @@ jobs: CIBW_ENVIRONMENT: ${{ matrix.CIBW_ENVIRONMENT }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install run: | @@ -114,7 +114,7 @@ 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: path: | dist/*.tar.gz From a83050c80c59762d52e4a84e49dfd9d471372438 Mon Sep 17 00:00:00 2001 From: Marc Lanctot Date: Sat, 6 Apr 2024 16:56:54 -0230 Subject: [PATCH 2/8] Fix name due to be unique to invocation --- .github/workflows/wheels.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 93e7cd668b..2609815db4 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -116,6 +116,7 @@ jobs: - uses: actions/upload-artifact@v4 with: + name: artifact-${{ matrix.runs-on }} path: | dist/*.tar.gz ./wheelhouse/*.whl From 3dbe65e1fdd205352f2d4803130d43847fd29c14 Mon Sep 17 00:00:00 2001 From: Marc Lanctot Date: Sat, 6 Apr 2024 21:15:10 -0230 Subject: [PATCH 3/8] Fix typo --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 2609815db4..1d1542aa34 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -116,7 +116,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: artifact-${{ matrix.runs-on }} + name: artifact-${{ matrix.os }} path: | dist/*.tar.gz ./wheelhouse/*.whl From 0770897bcb8d7bc3825cbb5669c03a4cff02cbf4 Mon Sep 17 00:00:00 2001 From: Marc Lanctot Date: Sun, 7 Apr 2024 09:22:10 -0230 Subject: [PATCH 4/8] Remove macos-11 + add macos-14 --- .github/workflows/actions.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index f1d900699a..4a8abd89dc 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -34,22 +34,22 @@ jobs: BUILD_SHARED_LIB: "OFF" OPEN_SPIEL_BUILD_WITH_ORTOOLS: "OFF" OPEN_SPIEL_BUILD_WITH_ORTOOLS_DOWNLOAD_URL: "" - - os: macos-12 - OS_PYTHON_VERSION: "3.9" + - os: macos-14 + 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. - - os: macos-11 - OS_PYTHON_VERSION: "3.8" + # Older Python version on Ubuntu 20.04 + - os: macos-12 + OS_PYTHON_VERSION: "3.9" 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: "" - # Older Python version on Ubuntu 20.04 - os: ubuntu-20.04 OS_PYTHON_VERSION: "3.9" DEFAULT_OPTIONAL_DEPENDENCY: "ON" From 08e061478c81c9c1ec5ca5b6c2a8074ac1ec64a9 Mon Sep 17 00:00:00 2001 From: Marc Lanctot Date: Sun, 7 Apr 2024 09:35:11 -0230 Subject: [PATCH 5/8] Use macos-13 (python3.11) instead of macos-14 --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 8a572564df..32d882d253 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -34,7 +34,7 @@ jobs: BUILD_SHARED_LIB: "OFF" OPEN_SPIEL_BUILD_WITH_ORTOOLS: "OFF" OPEN_SPIEL_BUILD_WITH_ORTOOLS_DOWNLOAD_URL: "" - - os: macos-14 + - os: macos-13 OS_PYTHON_VERSION: "3.11" TRAVIS_USE_NOX: 0 DEFAULT_OPTIONAL_DEPENDENCY: "OFF" From 8de8731325888cc276e5f8c199aef74e39010af2 Mon Sep 17 00:00:00 2001 From: Marc Lanctot Date: Sun, 7 Apr 2024 09:37:30 -0230 Subject: [PATCH 6/8] Update julia version to v2 --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 32d882d253..6e2eb4db35 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -75,7 +75,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: julia-actions/setup-julia@v1 + - uses: julia-actions/setup-julia@v2 with: version: 1.8 - name: Ad-hoc fix From bfe51fee9f0b41900b9a09214502f9a27f597f1a Mon Sep 17 00:00:00 2001 From: Marc Lanctot Date: Sun, 7 Apr 2024 10:01:32 -0230 Subject: [PATCH 7/8] Remove use of get-pip.py --- open_spiel/scripts/install.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/open_spiel/scripts/install.sh b/open_spiel/scripts/install.sh index 8ee38e1cd5..50891742a9 100755 --- a/open_spiel/scripts/install.sh +++ b/open_spiel/scripts/install.sh @@ -306,9 +306,7 @@ 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 + # 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). " \ From 4450ce60e8799c81d4d56b0eacb1231425e42eb3 Mon Sep 17 00:00:00 2001 From: Marc Lanctot Date: Sun, 7 Apr 2024 10:03:08 -0230 Subject: [PATCH 8/8] Add comment --- open_spiel/scripts/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/open_spiel/scripts/install.sh b/open_spiel/scripts/install.sh index 50891742a9..f6d137311a 100755 --- a/open_spiel/scripts/install.sh +++ b/open_spiel/scripts/install.sh @@ -306,6 +306,7 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then # Mac OSX cargo install bindgen-cli fi fi + # 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