From 626b88a5262b0eb6c207c58af42df3116a8b11a9 Mon Sep 17 00:00:00 2001 From: Jendrik Seipp Date: Wed, 4 Oct 2023 22:32:22 +0200 Subject: [PATCH 1/3] Allow compiling with CPLEX for repos not named 'downward'. --- .github/workflows/windows.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f99fb66797..3af9768273 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -71,12 +71,15 @@ jobs: echo "https://www.ibm.com/docs/en/icos/22.1.1?topic=2211-silent-installation-cplex-optimization-studio" curl.exe --output cplex.exe $ENV:CPLEX_URL + # This directory only already exists for repos called "downward". + mkdir D:\a\downward + echo "Install CPLEX" - Start-Process -FilePath .\cplex.exe -ArgumentList "-f", "D:\a\downward\downward\.github\workflows\misc\cplex2211_windows_installer.properties" -PassThru | Wait-Process + Start-Process -FilePath .\cplex.exe -ArgumentList "-f", "$ENV:GITHUB_WORKSPACE\.github\workflows\misc\cplex2211_windows_installer.properties" -PassThru | Wait-Process del .\cplex.exe echo "Copy the relevant directory to a location which is not magically protected against cmake" - Xcopy /E /I ..\cplex_temp\cplex ..\cplex + Xcopy /E /I D:\a\downward\cplex_temp\cplex $ENV:cplex_DIR - name: Compile planner From 7519fee9a91849b14d33ce20dd610b4365c60208 Mon Sep 17 00:00:00 2001 From: Jendrik Seipp Date: Wed, 4 Oct 2023 22:52:32 +0200 Subject: [PATCH 2/3] Trigger CI. --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3af9768273..2dbe8c9bc5 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -78,7 +78,7 @@ jobs: Start-Process -FilePath .\cplex.exe -ArgumentList "-f", "$ENV:GITHUB_WORKSPACE\.github\workflows\misc\cplex2211_windows_installer.properties" -PassThru | Wait-Process del .\cplex.exe - echo "Copy the relevant directory to a location which is not magically protected against cmake" + echo "Copy the relevant directory to a location which is not magically protected against CMake" Xcopy /E /I D:\a\downward\cplex_temp\cplex $ENV:cplex_DIR From 3b8bba9b8ed6dbca5a30ba68abf186e79735a356 Mon Sep 17 00:00:00 2001 From: Jendrik Seipp Date: Thu, 5 Oct 2023 15:41:48 +0200 Subject: [PATCH 3/3] Install CPLEX under D:\a directly. --- .../cplex2211_windows_installer.properties | 26 +++++++++---------- .github/workflows/windows.yml | 7 ++--- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/.github/workflows/misc/cplex2211_windows_installer.properties b/.github/workflows/misc/cplex2211_windows_installer.properties index 94d581dfed..75613d3c1a 100644 --- a/.github/workflows/misc/cplex2211_windows_installer.properties +++ b/.github/workflows/misc/cplex2211_windows_installer.properties @@ -20,11 +20,11 @@ LICENSE_ACCEPTED=TRUE #Choose installation directory #----------------------------- -USER_INSTALL_DIR=D:\\a\\downward\\cplex_temp +USER_INSTALL_DIR=D:\\a\\cplex_temp #Copy examples #------------------- -CPLEX_STUDIO_EXAMPLES_DIR=D:\\a\\downward\\cplex_examples +CPLEX_STUDIO_EXAMPLES_DIR=D:\\a\\cplex_examples CPLEX_STUDIO_SAMPLE_COPY_ACTIVATED=1 #Associate files with CPLEX @@ -40,17 +40,17 @@ INSTALLER_UI=silent #Install #------------ --fileOverwrite_D\:\\a\\downward\\cplex_temp\\README.html=Yes --fileOverwrite_D\:\\a\\downward\\cplex_temp\\Uninstall\\Uninstall.lax=Yes --fileOverwrite_D\:\\a\\downward\\cplex_temp\\Uninstall\\resource\\iawin64_x64.dll=Yes --fileOverwrite_D\:\\a\\downward\\cplex_temp\\Uninstall\\resource\\iawin32.dll=Yes --fileOverwrite_D\:\\a\\downward\\cplex_temp\\Uninstall\\resource\\win64_32_x64.exe=Yes --fileOverwrite_D\:\\a\\downward\\cplex_temp\\Uninstall\\resource\\remove.exe=Yes --fileOverwrite_D\:\\a\\downward\\cplex_temp\\Uninstall\\resource\\invoker.exe=Yes --fileOverwrite_D\:\\a\\downward\\cplex_temp\\Uninstall\\ibm_uninsticon.ico=Yes --fileOverwrite_D\:\\a\\downward\\cplex_temp\\opl\\oplide\\oplide_installer.bat=Yes --fileOverwrite_D\:\\a\\downward\\cplex_temp\\opl\\oplide\\oplide.exe=Yes --fileOverwrite_D\:\\a\\downward\\cplex_examples\\.samples=Yes +-fileOverwrite_D\:\\a\\cplex_temp\\README.html=Yes +-fileOverwrite_D\:\\a\\cplex_temp\\Uninstall\\Uninstall.lax=Yes +-fileOverwrite_D\:\\a\\cplex_temp\\Uninstall\\resource\\iawin64_x64.dll=Yes +-fileOverwrite_D\:\\a\\cplex_temp\\Uninstall\\resource\\iawin32.dll=Yes +-fileOverwrite_D\:\\a\\cplex_temp\\Uninstall\\resource\\win64_32_x64.exe=Yes +-fileOverwrite_D\:\\a\\cplex_temp\\Uninstall\\resource\\remove.exe=Yes +-fileOverwrite_D\:\\a\\cplex_temp\\Uninstall\\resource\\invoker.exe=Yes +-fileOverwrite_D\:\\a\\cplex_temp\\Uninstall\\ibm_uninsticon.ico=Yes +-fileOverwrite_D\:\\a\\cplex_temp\\opl\\oplide\\oplide_installer.bat=Yes +-fileOverwrite_D\:\\a\\cplex_temp\\opl\\oplide\\oplide.exe=Yes +-fileOverwrite_D\:\\a\\cplex_examples\\.samples=Yes #Post installation steps #------------------------------- diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2dbe8c9bc5..e7f448d510 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -12,7 +12,7 @@ env: CC: cl CXX: cl - cplex_DIR: D:\a\downward\cplex + cplex_DIR: D:\a\cplex CPLEX_URL: "${{ secrets.CPLEX2211_WINDOWS_URL }}" ZLIB_URL: "https://www.zlib.net/zlib13.zip" @@ -71,15 +71,12 @@ jobs: echo "https://www.ibm.com/docs/en/icos/22.1.1?topic=2211-silent-installation-cplex-optimization-studio" curl.exe --output cplex.exe $ENV:CPLEX_URL - # This directory only already exists for repos called "downward". - mkdir D:\a\downward - echo "Install CPLEX" Start-Process -FilePath .\cplex.exe -ArgumentList "-f", "$ENV:GITHUB_WORKSPACE\.github\workflows\misc\cplex2211_windows_installer.properties" -PassThru | Wait-Process del .\cplex.exe echo "Copy the relevant directory to a location which is not magically protected against CMake" - Xcopy /E /I D:\a\downward\cplex_temp\cplex $ENV:cplex_DIR + Xcopy /E /I D:\a\cplex_temp\cplex $ENV:cplex_DIR - name: Compile planner