[LL] Change to non lfs Windows distribution

yojvr · Aug 19, 2024 · 4236e12 · 4236e12
1 parent 2793d1b
commit 4236e12
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 41 deletions.
diff --git a/.github/workflows/amd64_windows_cmake_cpp.yml b/.github/workflows/amd64_windows_cmake_cpp.yml
@@ -23,20 +23,31 @@ jobs:
  - name: Checkout Knitro Windows
  uses: actions/checkout@v4
  with:
- repository: loicli/Knitro-Distrib-Windows
+ repository: loicli/knitro1400-Win64
  path: knitro_distrib
- ref: main
  token: ${{ secrets.KNITRO_DISTRIB }}
- lfs: true
+ - name: Unzip
+ run: |
+ 7z x "${{ env.KNITRODIR }}/knitroampl/knitroampl.zip" -o"${{ env.KNITRODIR }}/knitroampl"
+ 7z x "${{ env.KNITRODIR }}/knitromatlab/knitromatlab_mex.zip" -o"${{ env.KNITRODIR }}/knitromatlab"
+ 7z x "${{ env.KNITRODIR }}/lib/knitro.zip" -o"${{ env.KNITRODIR }}/lib"
+ rm ${{ env.KNITRODIR }}/knitroampl/knitroampl.zip
+ rm ${{ env.KNITRODIR }}/knitromatlab/knitromatlab_mex.zip
+ rm ${{ env.KNITRODIR }}/lib/knitro.zip
  - name: Copy license
  run: |
- echo "${{ secrets.KNITRO_DISTRIB_LICENSE }}" >> knitro_distrib/artelys_lic_cicd.txt
+ echo "${{ secrets.KNITRO_DISTRIB_LICENSE }}" >> ${{ env.ARTELYS_LICENSE }}/artelys_lic_cicd.txt
+ - name: Grant access to knitro distrib
+ run: |
+ icacls ${{ env.KNITRODIR }} /grant Everyone:RX /t
  - name: Check what I have
  run: |
- ls .
- ls ${{env.ARTELYS_LICENSE}}
- ls ${{ env.KNITRODIR }}
- - name: Check cmake
+ ls -l .
+ ls -l ${{ env.ARTELYS_LICENSE }}
+ ls -l ${{ env.KNITRODIR }}
+ ls -l ${{ env.KNITRODIR }}/knitroampl/
+ ls -l ${{ env.KNITRODIR }}/knitromatlab/
+ ls -l ${{ env.KNITRODIR }}/lib/ - name: Check cmake
  run: |
  cmake --version
  cmake -G || true

diff --git a/.github/workflows/windows_knitro_tests.yml b/.github/workflows/windows_knitro_tests.yml
@@ -7,7 +7,7 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
  native:
  env :
- KNITRODIR: ${{ github.workspace }}\knitro_distrib\knitro-14.1.0-Win64
+ KNITRODIR: ${{ github.workspace }}\knitro_distrib\knitro-14.0.0-Win64
  ARTELYS_LICENSE: ${{ github.workspace }}\knitro_distrib
  strategy:
  matrix:
@@ -18,57 +18,36 @@ jobs:
  name: Windows • Knitro Test • C++
  runs-on: windows-latest
  steps:
- # - name: Set up Git
- # run: |
- # git config --global core.autocrlf false
  - name: Checkout or-tools
  uses: actions/checkout@v4
  - name: Checkout Knitro Windows
  uses: actions/checkout@v4
  with:
- lfs: true
- repository: loicli/Knitro-Distrib-Windows
- path: knitro_distrib_zip
- # ref: main
+ repository: loicli/knitro1400-Win64
+ path: knitro_distrib
  token: ${{ secrets.KNITRO_DISTRIB }}
- # - name: Install Git LFS
- # run: |
- # git lfs install
- # - name: Pull LFS objects
- # run: |
- # git lfs pull
- # - name: Checkout LFS objects
- # run: git lfs checkout
  - name: Unzip
  run: |
- mkdir knitro_distrib
- 7z x "knitro_distrib_zip/knitro-14.1.0-Win64.zip" -o"${{ env.ARTELYS_LICENSE }}"
+ 7z x "${{ env.KNITRODIR }}/knitroampl/knitroampl.zip" -o"${{ env.KNITRODIR }}/knitroampl"
+ 7z x "${{ env.KNITRODIR }}/knitromatlab/knitromatlab_mex.zip" -o"${{ env.KNITRODIR }}/knitromatlab"
+ 7z x "${{ env.KNITRODIR }}/lib/knitro.zip" -o"${{ env.KNITRODIR }}/lib"
+ rm ${{ env.KNITRODIR }}/knitroampl/knitroampl.zip
+ rm ${{ env.KNITRODIR }}/knitromatlab/knitromatlab_mex.zip
+ rm ${{ env.KNITRODIR }}/lib/knitro.zip
  - name: Copy license
  run: |
  echo "${{ secrets.KNITRO_DISTRIB_LICENSE }}" >> ${{ env.ARTELYS_LICENSE }}/artelys_lic_cicd.txt
  - name: Grant access to knitro distrib
  run: |
  icacls ${{ env.KNITRODIR }} /grant Everyone:RX /t
- - name: check knitro distrib
- run: |
- cd knitro_distrib_zip/knitro_test
- ls .
- echo ${{ env.KNITRODIR }}
- cmake -S . -B build
- cmake --build build
- - name: run Knitro Test
- run: |
- cd knitro_distrib_zip/knitro_test
- ls .
- ls -l build/Debug
- cd build/Debug
- ./my_test.exe
  - name: Check what I have
  run: |
  ls -l .
  ls -l ${{ env.ARTELYS_LICENSE }}
  ls -l ${{ env.KNITRODIR }}
- ls -l ${{ env.KNITRODIR }}\lib
+ ls -l ${{ env.KNITRODIR }}/knitroampl/
+ ls -l ${{ env.KNITRODIR }}/knitromatlab/
+ ls -l ${{ env.KNITRODIR }}/lib/
  - name: Check cmake
  run: |
  cmake --version