From 19e8880dd82cfdabed244455f1c0bd2c72418674 Mon Sep 17 00:00:00 2001 From: Mohammed Ghannam Date: Fri, 27 Oct 2023 09:54:27 +0200 Subject: [PATCH 1/5] Try enabling windows ci workflow --- .github/workflows/build_and_test.yml | 37 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 5c970c1..7ed29c2 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -81,28 +81,27 @@ jobs: dry-run: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }} registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }} - # TODO: fix windows workflow - # Windows-test: - # env: - # SCIPOPTDIR: C:\scipoptdir - # runs-on: windows-latest - # steps: - # - uses: actions/checkout@v2 + windows-test: + env: + SCIPOPTDIR: C:\scipoptdir + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 - # - name: Download dependencies (SCIPOptSuite) - # shell: powershell - # run: wget https://scipopt.org/download/release/SCIPOptSuite-${{ env.version }}-win64-VS15.exe -outfile scipopt-installer.exe + - name: Download dependencies (SCIPOptSuite) + shell: powershell + run: wget https://scipopt.org/download/release/SCIPOptSuite-${{ env.version }}-win64-VS15.exe -outfile scipopt-installer.exe - # - name: Install dependencies (SCIPOptSuite) - # shell: cmd - # run: scipopt-installer.exe /S /D=${{ env.SCIPOPTDIR }} + - name: Install dependencies (SCIPOptSuite) + shell: cmd + run: scipopt-installer.exe /S /D=${{ env.SCIPOPTDIR }} - # - name: Build and test - # shell: powershell - # run: | - # $Env:SCIPOPTDIR = "${{ env.SCIPOPTDIR }}" - # cargo build - # cargo test + - name: Build and test + shell: powershell + run: | + $Env:SCIPOPTDIR = "${{ env.SCIPOPTDIR }}" + cargo build + cargo test # TODO: move to scip-sys repo # MacOS-test: From b7675f47573b3a61abc8535b9c3e82ab4efb7163 Mon Sep 17 00:00:00 2001 From: Mohammed Ghannam Date: Fri, 27 Oct 2023 12:07:34 +0200 Subject: [PATCH 2/5] CI: windows, Add libscip to path --- .github/workflows/build_and_test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 7ed29c2..aa91fd1 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -100,6 +100,7 @@ jobs: shell: powershell run: | $Env:SCIPOPTDIR = "${{ env.SCIPOPTDIR }}" + $Env:PATH += ";$Env:SCIPOPTDIR/lib" cargo build cargo test From a54115f9ea6b1f99d020debf8294e096711c6f83 Mon Sep 17 00:00:00 2001 From: Mohammed Ghannam Date: Fri, 27 Oct 2023 15:26:48 +0200 Subject: [PATCH 3/5] Use bin instead of lib --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index aa91fd1..e3996b3 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -100,7 +100,7 @@ jobs: shell: powershell run: | $Env:SCIPOPTDIR = "${{ env.SCIPOPTDIR }}" - $Env:PATH += ";$Env:SCIPOPTDIR/lib" + $Env:PATH += ";$Env:SCIPOPTDIR/bin" cargo build cargo test From 341eec3a2bd66a81198cdeb7fb14637a2eafb74c Mon Sep 17 00:00:00 2001 From: Mohammed Ghannam Date: Fri, 27 Oct 2023 15:46:19 +0200 Subject: [PATCH 4/5] Skip publish job if no tag is pushed --- .github/workflows/build_and_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index e3996b3..b73bfeb 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -77,8 +77,8 @@ jobs: override: true - name: publish crate uses: katyo/publish-crates@v2 + if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }} with: - dry-run: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }} registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }} windows-test: From 0370c4a048888473ce7790dddec807d1589745fc Mon Sep 17 00:00:00 2001 From: Mohammed Ghannam Date: Fri, 27 Oct 2023 15:47:51 +0200 Subject: [PATCH 5/5] Add windows test to dependencies --- .github/workflows/build_and_test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index b73bfeb..c6bb38e 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -68,6 +68,7 @@ jobs: needs: - linux-conda-test - test-with-coverage + - windows-test runs-on: ubuntu-latest steps: - uses: actions/checkout@v3