From 1a54e43249b14e066785ab59adc6a26ae9281725 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 12:20:29 +0300 Subject: [PATCH 01/28] installs and OSs --- ...etch-content.yml => cmake-fetch-linux.yml} | 13 ++-- ...ke-find-highs.yml => cmake-find-linux.yml} | 27 +++---- .github/workflows/cmake-find-macos.yml | 73 +++++++++++++++++++ .github/workflows/cmake-find-windows.yml | 73 +++++++++++++++++++ 4 files changed, 163 insertions(+), 23 deletions(-) rename .github/workflows/{cmake-fetch-content.yml => cmake-fetch-linux.yml} (72%) rename .github/workflows/{cmake-find-highs.yml => cmake-find-linux.yml} (77%) create mode 100644 .github/workflows/cmake-find-macos.yml create mode 100644 .github/workflows/cmake-find-windows.yml diff --git a/.github/workflows/cmake-fetch-content.yml b/.github/workflows/cmake-fetch-linux.yml similarity index 72% rename from .github/workflows/cmake-fetch-content.yml rename to .github/workflows/cmake-fetch-linux.yml index 22abc62..d7b42ba 100644 --- a/.github/workflows/cmake-fetch-content.yml +++ b/.github/workflows/cmake-fetch-linux.yml @@ -23,23 +23,22 @@ jobs: - name: Create build dir run: | - cmake -E make_directory ${{runner.workspace}}/build-fetch-content-${{matrix.branch}} + cmake -E make_directory ${{runner.workspace}}/build-fetch-${{matrix.branch}} - name: Build CMakeFindHighsPackage - working-directory: ${{runner.workspace}}/build-fetch-content-${{matrix.branch}} + working-directory: ${{runner.workspace}}/build-fetch-${{matrix.branch}} shell: bash run: | cmake ${{runner.workspace}}/highs-tests/CMakeHighsFetchContent-main-${{matrix.branch}} \ - -DBRANCH=${{matrix.branch}} + -DBRANCH=${{matrix.branch}} \ + -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-fetch-highs-${{matrix.branch}} cmake --build . --parallel - name: Test - working-directory: ${{runner.workspace}}/build-fetch-content-${{matrix.branch}} + working-directory: ${{runner.workspace}}/build-fetch-${{matrix.branch}} shell: bash run: | ./main - # todo, not implemented yet in CMakeHighsFetchContent - # - name: Test install - + - name: Test install # trigger test \ No newline at end of file diff --git a/.github/workflows/cmake-find-highs.yml b/.github/workflows/cmake-find-linux.yml similarity index 77% rename from .github/workflows/cmake-find-highs.yml rename to .github/workflows/cmake-find-linux.yml index 6e49414..23666b6 100644 --- a/.github/workflows/cmake-find-highs.yml +++ b/.github/workflows/cmake-find-linux.yml @@ -1,14 +1,13 @@ -name: cmake-find-highs +name: cmake-find-linux on: [push, pull_request] jobs: - master: + ubuntu: runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: - # os: [ubuntu-latest, windows-latest] os: [ubuntu-latest] branch: [master, latest, cmake] @@ -34,8 +33,7 @@ jobs: cmake -E make_directory ${{runner.workspace}}/build-highs-${{matrix.branch}} cmake -E make_directory ${{runner.workspace}}/install-highs-${{matrix.branch}} cmake -E make_directory ${{runner.workspace}}/build-find-highs-${{matrix.branch}} - - # cmake -E make_directory ${{runner.workspace}}/install-find-highs-${{matrix.branch}} + cmake -E make_directory ${{runner.workspace}}/install-find-highs-${{matrix.branch}} - name: Configure CMake HiGHS shell: bash @@ -52,17 +50,15 @@ jobs: ctest cmake --install . - # - name: Build and install CMakeFindHighsPackage - name: Build CMakeFindHighsPackage working-directory: ${{runner.workspace}}/build-find-highs-${{matrix.branch}} shell: bash run: | cmake ${{runner.workspace}}/highs-tests/CMakeHighsFindPackage-master-${{matrix.branch}} \ - -DHIGHS_DIR=${{runner.workspace}}/install-highs-${{matrix.branch}}/lib/cmake/highs + -DHIGHS_DIR=${{runner.workspace}}/install-highs-${{matrix.branch}}/lib/cmake/highs \ + -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-find-highs-${{matrix.branch}} cmake --build . --parallel - - # cmake --install . - # -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-find-highs-${{matrix.branch}} + cmake --install . - name: Test build working-directory: ${{runner.workspace}}/build-find-highs-${{matrix.branch}} @@ -70,9 +66,8 @@ jobs: run: | ./main - # does not find highs lib, needs more cmake code in CMakeFindHighsPackage - # - name: Test install - # working-directory: ${{runner.workspace}}/install-find-highs-${{matrix.branch}} - # shell: bash - # run: | - # ./bin/main \ No newline at end of file + - name: Test install + working-directory: ${{runner.workspace}}/install-find-highs-${{matrix.branch}} + shell: bash + run: | + LD_LIBRARY_PATH=${{runner.workspace}}/install-highs-${{matrix.branch}}/lib ./bin/main \ No newline at end of file diff --git a/.github/workflows/cmake-find-macos.yml b/.github/workflows/cmake-find-macos.yml new file mode 100644 index 0000000..a782a2e --- /dev/null +++ b/.github/workflows/cmake-find-macos.yml @@ -0,0 +1,73 @@ +name: cmake-find-macos + +on: [push, pull_request] + +jobs: + ubuntu: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [macos-latest] + branch: [master, latest, cmake] + + steps: + - uses: actions/checkout@v4 + + - name: Checkout HiGHS repo + uses: actions/checkout@v4 + with: + repository: ERGO-Code/HiGHS + ref: ${{matrix.branch}} + path: HiGHS-${{matrix.branch}} + + - name: Checkout CMakeHighsFindPackage + uses: actions/checkout@v4 + with: + repository: galabovaa/CMakeHighsFindPackage + ref: master + path: CMakeHighsFindPackage-master-${{matrix.branch}} + + - name: Create build and install dirs + run: | + cmake -E make_directory ${{runner.workspace}}/build-highs-${{matrix.branch}} + cmake -E make_directory ${{runner.workspace}}/install-highs-${{matrix.branch}} + cmake -E make_directory ${{runner.workspace}}/build-find-highs-${{matrix.branch}} + cmake -E make_directory ${{runner.workspace}}/install-find-highs-${{matrix.branch}} + + - name: Configure CMake HiGHS + shell: bash + working-directory: ${{runner.workspace}}/build-highs-${{matrix.branch}} + run: | + cmake ${{runner.workspace}}/highs-tests/HiGHS-${{matrix.branch}} \ + -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-highs-${{matrix.branch}} + + - name: Build, ctest and install HiGHS + working-directory: ${{runner.workspace}}/build-highs-${{matrix.branch}} + shell: bash + run: | + cmake --build . --parallel + ctest + cmake --install . + + - name: Build CMakeFindHighsPackage + working-directory: ${{runner.workspace}}/build-find-highs-${{matrix.branch}} + shell: bash + run: | + cmake ${{runner.workspace}}/highs-tests/CMakeHighsFindPackage-master-${{matrix.branch}} \ + -DHIGHS_DIR=${{runner.workspace}}/install-highs-${{matrix.branch}}/lib/cmake/highs \ + -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-find-highs-${{matrix.branch}} + cmake --build . --parallel + cmake --install . + + - name: Test build + working-directory: ${{runner.workspace}}/build-find-highs-${{matrix.branch}} + shell: bash + run: | + ./main + + - name: Test install + working-directory: ${{runner.workspace}}/install-find-highs-${{matrix.branch}} + shell: bash + run: | + DYLD_LIBRARY_PATH=${{runner.workspace}}/install-highs-${{matrix.branch}}/lib ./bin/main \ No newline at end of file diff --git a/.github/workflows/cmake-find-windows.yml b/.github/workflows/cmake-find-windows.yml new file mode 100644 index 0000000..2a565a8 --- /dev/null +++ b/.github/workflows/cmake-find-windows.yml @@ -0,0 +1,73 @@ +name: cmake-find-windows + +on: [push, pull_request] + +jobs: + ubuntu: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [windows-latest] + branch: [master, latest, cmake] + + steps: + - uses: actions/checkout@v4 + + - name: Checkout HiGHS repo + uses: actions/checkout@v4 + with: + repository: ERGO-Code/HiGHS + ref: ${{matrix.branch}} + path: HiGHS-${{matrix.branch}} + + - name: Checkout CMakeHighsFindPackage + uses: actions/checkout@v4 + with: + repository: galabovaa/CMakeHighsFindPackage + ref: master + path: CMakeHighsFindPackage-master-${{matrix.branch}} + + - name: Create build and install dirs + run: | + cmake -E make_directory ${{runner.workspace}}/build-highs-${{matrix.branch}} + cmake -E make_directory ${{runner.workspace}}/install-highs-${{matrix.branch}} + cmake -E make_directory ${{runner.workspace}}/build-find-highs-${{matrix.branch}} + cmake -E make_directory ${{runner.workspace}}/install-find-highs-${{matrix.branch}} + + - name: Configure CMake HiGHS + shell: bash + working-directory: ${{runner.workspace}}/build-highs-${{matrix.branch}} + run: | + cmake ${{runner.workspace}}/highs-tests/HiGHS-${{matrix.branch}} \ + -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-highs-${{matrix.branch}} + + - name: Build, ctest and install HiGHS + working-directory: ${{runner.workspace}}/build-highs-${{matrix.branch}} + shell: bash + run: | + cmake --build . --parallel --config Release + ctest -C Release + cmake --install . + + - name: Build CMakeFindHighsPackage + working-directory: ${{runner.workspace}}/build-find-highs-${{matrix.branch}} + shell: bash + run: | + cmake ${{runner.workspace}}/highs-tests/CMakeHighsFindPackage-master-${{matrix.branch}} \ + -DHIGHS_DIR=${{runner.workspace}}/install-highs-${{matrix.branch}}/lib/cmake/highs \ + -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-find-highs-${{matrix.branch}} + cmake --build . --parallel --config Release + cmake --install . + + - name: Test build + working-directory: ${{runner.workspace}}/build-find-highs-${{matrix.branch}} + shell: bash + run: | + ./main.exe + + - name: Test install + working-directory: ${{runner.workspace}}/install-find-highs-${{matrix.branch}} + shell: bash + run: | + ./bin/Release/main.exe \ No newline at end of file From db784689c494e20457bd62e921b7f40f082364df Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 12:43:20 +0300 Subject: [PATCH 02/28] fetch linux and find windows bash --- .github/workflows/cmake-fetch-linux.yml | 7 +++++-- .github/workflows/cmake-find-macos.yml | 2 +- .github/workflows/cmake-find-windows.yml | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake-fetch-linux.yml b/.github/workflows/cmake-fetch-linux.yml index d7b42ba..baae7bf 100644 --- a/.github/workflows/cmake-fetch-linux.yml +++ b/.github/workflows/cmake-fetch-linux.yml @@ -31,7 +31,7 @@ jobs: run: | cmake ${{runner.workspace}}/highs-tests/CMakeHighsFetchContent-main-${{matrix.branch}} \ -DBRANCH=${{matrix.branch}} \ - -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-fetch-highs-${{matrix.branch}} + -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-fetch-${{matrix.branch}} cmake --build . --parallel - name: Test @@ -41,4 +41,7 @@ jobs: ./main - name: Test install - # trigger test \ No newline at end of file + working-directory: ${{runner.workspace}}/install-fetch-${{matrix.branch}} + shell: bash + run: | + ./bin/main \ No newline at end of file diff --git a/.github/workflows/cmake-find-macos.yml b/.github/workflows/cmake-find-macos.yml index a782a2e..5e6ebea 100644 --- a/.github/workflows/cmake-find-macos.yml +++ b/.github/workflows/cmake-find-macos.yml @@ -3,7 +3,7 @@ name: cmake-find-macos on: [push, pull_request] jobs: - ubuntu: + macos: runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/cmake-find-windows.yml b/.github/workflows/cmake-find-windows.yml index 2a565a8..2e595d9 100644 --- a/.github/workflows/cmake-find-windows.yml +++ b/.github/workflows/cmake-find-windows.yml @@ -3,7 +3,7 @@ name: cmake-find-windows on: [push, pull_request] jobs: - ubuntu: + windows: runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -29,6 +29,7 @@ jobs: path: CMakeHighsFindPackage-master-${{matrix.branch}} - name: Create build and install dirs + shell: bash run: | cmake -E make_directory ${{runner.workspace}}/build-highs-${{matrix.branch}} cmake -E make_directory ${{runner.workspace}}/install-highs-${{matrix.branch}} From dcfe6ad1a5a70a299542376d13bbafa5d75d1cb9 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 12:47:58 +0300 Subject: [PATCH 03/28] add install to fetch linux --- .github/workflows/cmake-fetch-linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cmake-fetch-linux.yml b/.github/workflows/cmake-fetch-linux.yml index baae7bf..4a66f72 100644 --- a/.github/workflows/cmake-fetch-linux.yml +++ b/.github/workflows/cmake-fetch-linux.yml @@ -33,6 +33,7 @@ jobs: -DBRANCH=${{matrix.branch}} \ -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-fetch-${{matrix.branch}} cmake --build . --parallel + cmake --install . - name: Test working-directory: ${{runner.workspace}}/build-fetch-${{matrix.branch}} From a8c4f8686ea9271264a45c303785b591cc942f01 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 12:49:54 +0300 Subject: [PATCH 04/28] win paths --- .github/workflows/cmake-find-windows.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cmake-find-windows.yml b/.github/workflows/cmake-find-windows.yml index 2e595d9..200a98e 100644 --- a/.github/workflows/cmake-find-windows.yml +++ b/.github/workflows/cmake-find-windows.yml @@ -31,20 +31,20 @@ jobs: - name: Create build and install dirs shell: bash run: | - cmake -E make_directory ${{runner.workspace}}/build-highs-${{matrix.branch}} - cmake -E make_directory ${{runner.workspace}}/install-highs-${{matrix.branch}} - cmake -E make_directory ${{runner.workspace}}/build-find-highs-${{matrix.branch}} - cmake -E make_directory ${{runner.workspace}}/install-find-highs-${{matrix.branch}} + cmake -E make_directory ${{runner.workspace}}\build-highs-${{matrix.branch}} + cmake -E make_directory ${{runner.workspace}}\install-highs-${{matrix.branch}} + cmake -E make_directory ${{runner.workspace}}\build-find-highs-${{matrix.branch}} + cmake -E make_directory ${{runner.workspace}}\install-find-highs-${{matrix.branch}} - name: Configure CMake HiGHS shell: bash - working-directory: ${{runner.workspace}}/build-highs-${{matrix.branch}} + working-directory: ${{runner.workspace}}\build-highs-${{matrix.branch}} run: | cmake ${{runner.workspace}}/highs-tests/HiGHS-${{matrix.branch}} \ -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-highs-${{matrix.branch}} - name: Build, ctest and install HiGHS - working-directory: ${{runner.workspace}}/build-highs-${{matrix.branch}} + working-directory: ${{runner.workspace}}\build-highs-${{matrix.branch}} shell: bash run: | cmake --build . --parallel --config Release @@ -52,7 +52,7 @@ jobs: cmake --install . - name: Build CMakeFindHighsPackage - working-directory: ${{runner.workspace}}/build-find-highs-${{matrix.branch}} + working-directory: ${{runner.workspace}}\build-find-highs-${{matrix.branch}} shell: bash run: | cmake ${{runner.workspace}}/highs-tests/CMakeHighsFindPackage-master-${{matrix.branch}} \ @@ -62,13 +62,13 @@ jobs: cmake --install . - name: Test build - working-directory: ${{runner.workspace}}/build-find-highs-${{matrix.branch}} + working-directory: ${{runner.workspace}}\build-find-highs-${{matrix.branch}} shell: bash run: | ./main.exe - name: Test install - working-directory: ${{runner.workspace}}/install-find-highs-${{matrix.branch}} + working-directory: ${{runner.workspace}}\install-find-highs-${{matrix.branch}} shell: bash run: | ./bin/Release/main.exe \ No newline at end of file From c6de734f6f950ded189d63d24e2e014677f90325 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 12:55:38 +0300 Subject: [PATCH 05/28] win paths --- .github/workflows/cmake-find-windows.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cmake-find-windows.yml b/.github/workflows/cmake-find-windows.yml index 200a98e..2e595d9 100644 --- a/.github/workflows/cmake-find-windows.yml +++ b/.github/workflows/cmake-find-windows.yml @@ -31,20 +31,20 @@ jobs: - name: Create build and install dirs shell: bash run: | - cmake -E make_directory ${{runner.workspace}}\build-highs-${{matrix.branch}} - cmake -E make_directory ${{runner.workspace}}\install-highs-${{matrix.branch}} - cmake -E make_directory ${{runner.workspace}}\build-find-highs-${{matrix.branch}} - cmake -E make_directory ${{runner.workspace}}\install-find-highs-${{matrix.branch}} + cmake -E make_directory ${{runner.workspace}}/build-highs-${{matrix.branch}} + cmake -E make_directory ${{runner.workspace}}/install-highs-${{matrix.branch}} + cmake -E make_directory ${{runner.workspace}}/build-find-highs-${{matrix.branch}} + cmake -E make_directory ${{runner.workspace}}/install-find-highs-${{matrix.branch}} - name: Configure CMake HiGHS shell: bash - working-directory: ${{runner.workspace}}\build-highs-${{matrix.branch}} + working-directory: ${{runner.workspace}}/build-highs-${{matrix.branch}} run: | cmake ${{runner.workspace}}/highs-tests/HiGHS-${{matrix.branch}} \ -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-highs-${{matrix.branch}} - name: Build, ctest and install HiGHS - working-directory: ${{runner.workspace}}\build-highs-${{matrix.branch}} + working-directory: ${{runner.workspace}}/build-highs-${{matrix.branch}} shell: bash run: | cmake --build . --parallel --config Release @@ -52,7 +52,7 @@ jobs: cmake --install . - name: Build CMakeFindHighsPackage - working-directory: ${{runner.workspace}}\build-find-highs-${{matrix.branch}} + working-directory: ${{runner.workspace}}/build-find-highs-${{matrix.branch}} shell: bash run: | cmake ${{runner.workspace}}/highs-tests/CMakeHighsFindPackage-master-${{matrix.branch}} \ @@ -62,13 +62,13 @@ jobs: cmake --install . - name: Test build - working-directory: ${{runner.workspace}}\build-find-highs-${{matrix.branch}} + working-directory: ${{runner.workspace}}/build-find-highs-${{matrix.branch}} shell: bash run: | ./main.exe - name: Test install - working-directory: ${{runner.workspace}}\install-find-highs-${{matrix.branch}} + working-directory: ${{runner.workspace}}/install-find-highs-${{matrix.branch}} shell: bash run: | ./bin/Release/main.exe \ No newline at end of file From ba72b596eeb82d3cefa6d15d26fefe0c51e2a2ca Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 12:59:36 +0300 Subject: [PATCH 06/28] no shell --- .github/workflows/cmake-find-windows.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cmake-find-windows.yml b/.github/workflows/cmake-find-windows.yml index 2e595d9..c1ee6ef 100644 --- a/.github/workflows/cmake-find-windows.yml +++ b/.github/workflows/cmake-find-windows.yml @@ -29,19 +29,17 @@ jobs: path: CMakeHighsFindPackage-master-${{matrix.branch}} - name: Create build and install dirs - shell: bash run: | - cmake -E make_directory ${{runner.workspace}}/build-highs-${{matrix.branch}} - cmake -E make_directory ${{runner.workspace}}/install-highs-${{matrix.branch}} - cmake -E make_directory ${{runner.workspace}}/build-find-highs-${{matrix.branch}} - cmake -E make_directory ${{runner.workspace}}/install-find-highs-${{matrix.branch}} + mkdir ${{runner.workspace}}\\build-highs-${{matrix.branch}} + mkdir ${{runner.workspace}}\\install-highs-${{matrix.branch}} + mkdir ${{runner.workspace}}\\build-find-highs-${{matrix.branch}} + mkdir ${{runner.workspace}}\\install-find-highs-${{matrix.branch}} - name: Configure CMake HiGHS - shell: bash - working-directory: ${{runner.workspace}}/build-highs-${{matrix.branch}} + working-directory: ${{runner.workspace}}\\build-highs-${{matrix.branch}} run: | - cmake ${{runner.workspace}}/highs-tests/HiGHS-${{matrix.branch}} \ - -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-highs-${{matrix.branch}} + cmake ${{runner.workspace}}\\highs-tests\\HiGHS-${{matrix.branch}} \ + -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}\\install-highs-${{matrix.branch}} - name: Build, ctest and install HiGHS working-directory: ${{runner.workspace}}/build-highs-${{matrix.branch}} From 9bec0120e67415b73199b211069f37916de78225 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 13:02:51 +0300 Subject: [PATCH 07/28] working dir double slash --- .github/workflows/cmake-find-windows.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cmake-find-windows.yml b/.github/workflows/cmake-find-windows.yml index c1ee6ef..efdde36 100644 --- a/.github/workflows/cmake-find-windows.yml +++ b/.github/workflows/cmake-find-windows.yml @@ -37,12 +37,13 @@ jobs: - name: Configure CMake HiGHS working-directory: ${{runner.workspace}}\\build-highs-${{matrix.branch}} + shell: bash run: | - cmake ${{runner.workspace}}\\highs-tests\\HiGHS-${{matrix.branch}} \ - -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}\\install-highs-${{matrix.branch}} + cmake ${{runner.workspace}}/highs-tests/HiGHS-${{matrix.branch}} \ + -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-highs-${{matrix.branch}} - name: Build, ctest and install HiGHS - working-directory: ${{runner.workspace}}/build-highs-${{matrix.branch}} + working-directory: ${{runner.workspace}}\\build-highs-${{matrix.branch}} shell: bash run: | cmake --build . --parallel --config Release @@ -50,7 +51,7 @@ jobs: cmake --install . - name: Build CMakeFindHighsPackage - working-directory: ${{runner.workspace}}/build-find-highs-${{matrix.branch}} + working-directory: ${{runner.workspace}}\\build-find-highs-${{matrix.branch}} shell: bash run: | cmake ${{runner.workspace}}/highs-tests/CMakeHighsFindPackage-master-${{matrix.branch}} \ @@ -60,13 +61,13 @@ jobs: cmake --install . - name: Test build - working-directory: ${{runner.workspace}}/build-find-highs-${{matrix.branch}} + working-directory: ${{runner.workspace}}\\build-find-highs-${{matrix.branch}} shell: bash run: | ./main.exe - name: Test install - working-directory: ${{runner.workspace}}/install-find-highs-${{matrix.branch}} + working-directory: ${{runner.workspace}}\\install-find-highs-${{matrix.branch}} shell: bash run: | ./bin/Release/main.exe \ No newline at end of file From d04ff9673efd4365179f61d652fd6c8659d09dc4 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 13:06:08 +0300 Subject: [PATCH 08/28] path to source --- .github/workflows/cmake-find-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake-find-windows.yml b/.github/workflows/cmake-find-windows.yml index efdde36..6ea167d 100644 --- a/.github/workflows/cmake-find-windows.yml +++ b/.github/workflows/cmake-find-windows.yml @@ -39,7 +39,7 @@ jobs: working-directory: ${{runner.workspace}}\\build-highs-${{matrix.branch}} shell: bash run: | - cmake ${{runner.workspace}}/highs-tests/HiGHS-${{matrix.branch}} \ + cmake ${{runner.workspace}}\\highs-tests\\HiGHS-${{matrix.branch}} \ -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-highs-${{matrix.branch}} - name: Build, ctest and install HiGHS From 24b24b2f14523979aa718384e17a589ebffa6d48 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 13:08:19 +0300 Subject: [PATCH 09/28] runner workspace --- .github/workflows/cmake-find-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake-find-windows.yml b/.github/workflows/cmake-find-windows.yml index 6ea167d..61dc9c5 100644 --- a/.github/workflows/cmake-find-windows.yml +++ b/.github/workflows/cmake-find-windows.yml @@ -39,7 +39,7 @@ jobs: working-directory: ${{runner.workspace}}\\build-highs-${{matrix.branch}} shell: bash run: | - cmake ${{runner.workspace}}\\highs-tests\\HiGHS-${{matrix.branch}} \ + cmake $GITHUB_WORKSACE/HiGHS-${{matrix.branch}} \ -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-highs-${{matrix.branch}} - name: Build, ctest and install HiGHS From a477fcc00a06e984ce1ff6c1df64d132f913e9bf Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 13:11:04 +0300 Subject: [PATCH 10/28] path --- .github/workflows/cmake-find-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake-find-windows.yml b/.github/workflows/cmake-find-windows.yml index 61dc9c5..6ea167d 100644 --- a/.github/workflows/cmake-find-windows.yml +++ b/.github/workflows/cmake-find-windows.yml @@ -39,7 +39,7 @@ jobs: working-directory: ${{runner.workspace}}\\build-highs-${{matrix.branch}} shell: bash run: | - cmake $GITHUB_WORKSACE/HiGHS-${{matrix.branch}} \ + cmake ${{runner.workspace}}\\highs-tests\\HiGHS-${{matrix.branch}} \ -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-highs-${{matrix.branch}} - name: Build, ctest and install HiGHS From 169b52d8507af4cd8f55bff194a189f6389db5c9 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 13:12:56 +0300 Subject: [PATCH 11/28] paths --- .github/workflows/cmake-find-windows.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cmake-find-windows.yml b/.github/workflows/cmake-find-windows.yml index 6ea167d..af096c7 100644 --- a/.github/workflows/cmake-find-windows.yml +++ b/.github/workflows/cmake-find-windows.yml @@ -37,14 +37,11 @@ jobs: - name: Configure CMake HiGHS working-directory: ${{runner.workspace}}\\build-highs-${{matrix.branch}} - shell: bash run: | - cmake ${{runner.workspace}}\\highs-tests\\HiGHS-${{matrix.branch}} \ - -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-highs-${{matrix.branch}} + cmake ${{runner.workspace}}\\highs-tests\\HiGHS-${{matrix.branch}} -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}\\install-highs-${{matrix.branch}} - name: Build, ctest and install HiGHS working-directory: ${{runner.workspace}}\\build-highs-${{matrix.branch}} - shell: bash run: | cmake --build . --parallel --config Release ctest -C Release @@ -54,7 +51,7 @@ jobs: working-directory: ${{runner.workspace}}\\build-find-highs-${{matrix.branch}} shell: bash run: | - cmake ${{runner.workspace}}/highs-tests/CMakeHighsFindPackage-master-${{matrix.branch}} \ + cmake ${{runner.workspace}}\\highs-tests\\CMakeHighsFindPackage-master-${{matrix.branch}} \ -DHIGHS_DIR=${{runner.workspace}}/install-highs-${{matrix.branch}}/lib/cmake/highs \ -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-find-highs-${{matrix.branch}} cmake --build . --parallel --config Release From bee73ee0816b7bd5fbc3bc04a5ab1e9698828c87 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 13:14:16 +0300 Subject: [PATCH 12/28] syntax --- .github/workflows/cmake-find-windows.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake-find-windows.yml b/.github/workflows/cmake-find-windows.yml index af096c7..2f454d3 100644 --- a/.github/workflows/cmake-find-windows.yml +++ b/.github/workflows/cmake-find-windows.yml @@ -37,8 +37,10 @@ jobs: - name: Configure CMake HiGHS working-directory: ${{runner.workspace}}\\build-highs-${{matrix.branch}} + shell: bash run: | - cmake ${{runner.workspace}}\\highs-tests\\HiGHS-${{matrix.branch}} -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}\\install-highs-${{matrix.branch}} + cmake ${{runner.workspace}}\\highs-tests\\HiGHS-${{matrix.branch}} \ + -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}\\install-highs-${{matrix.branch}} - name: Build, ctest and install HiGHS working-directory: ${{runner.workspace}}\\build-highs-${{matrix.branch}} From 58d425afafc55414807a8e96cce2b3659337527e Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 13:18:06 +0300 Subject: [PATCH 13/28] more syntax --- .github/workflows/cmake-find-windows.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cmake-find-windows.yml b/.github/workflows/cmake-find-windows.yml index 2f454d3..b15e6f3 100644 --- a/.github/workflows/cmake-find-windows.yml +++ b/.github/workflows/cmake-find-windows.yml @@ -37,9 +37,8 @@ jobs: - name: Configure CMake HiGHS working-directory: ${{runner.workspace}}\\build-highs-${{matrix.branch}} - shell: bash - run: | - cmake ${{runner.workspace}}\\highs-tests\\HiGHS-${{matrix.branch}} \ + run: > + cmake ${{runner.workspace}}\\highs-tests\\HiGHS-${{matrix.branch}} -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}\\install-highs-${{matrix.branch}} - name: Build, ctest and install HiGHS @@ -49,13 +48,16 @@ jobs: ctest -C Release cmake --install . - - name: Build CMakeFindHighsPackage + - name: Configure CMakeFindHighsPackage + working-directory: ${{runner.workspace}}\\build-find-highs-${{matrix.branch}} + run: > + cmake ${{runner.workspace}}\\highs-tests\\CMakeHighsFindPackage-master-${{matrix.branch}} + -DHIGHS_DIR=${{runner.workspace}}\\install-highs-${{matrix.branch}}\\lib\\cmake\\highs + -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}\\install-find-highs-${{matrix.branch}} + + - name: Build and install CMakeFindHighsPackage working-directory: ${{runner.workspace}}\\build-find-highs-${{matrix.branch}} - shell: bash run: | - cmake ${{runner.workspace}}\\highs-tests\\CMakeHighsFindPackage-master-${{matrix.branch}} \ - -DHIGHS_DIR=${{runner.workspace}}/install-highs-${{matrix.branch}}/lib/cmake/highs \ - -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-find-highs-${{matrix.branch}} cmake --build . --parallel --config Release cmake --install . From 778ccb7f1b72519ff470e5d0406c22316110a437 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 13:25:36 +0300 Subject: [PATCH 14/28] wip --- .github/workflows/cmake-find-build-linux.yml | 70 ++++++++++++++++++++ .github/workflows/cmake-find-windows.yml | 4 +- 2 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/cmake-find-build-linux.yml diff --git a/.github/workflows/cmake-find-build-linux.yml b/.github/workflows/cmake-find-build-linux.yml new file mode 100644 index 0000000..ee67685 --- /dev/null +++ b/.github/workflows/cmake-find-build-linux.yml @@ -0,0 +1,70 @@ +name: cmake-find-build-linux + +on: [push, pull_request] + +jobs: + ubuntu: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest] + branch: [master, latest, cmake] + + steps: + - uses: actions/checkout@v4 + + - name: Checkout HiGHS repo + uses: actions/checkout@v4 + with: + repository: ERGO-Code/HiGHS + ref: ${{matrix.branch}} + path: HiGHS-${{matrix.branch}}-b + + - name: Checkout CMakeHighsFindPackage + uses: actions/checkout@v4 + with: + repository: galabovaa/CMakeHighsFindPackage + ref: master + path: CMakeHighsFindPackage-master-${{matrix.branch}}-b + + - name: Create build and install dirs + run: | + cmake -E make_directory ${{runner.workspace}}/build-highs-${{matrix.branch}}-b + cmake -E make_directory ${{runner.workspace}}/build-find-build-${{matrix.branch}} + cmake -E make_directory ${{runner.workspace}}/install-find-build-${{matrix.branch}} + + - name: Configure CMake HiGHS + shell: bash + working-directory: ${{runner.workspace}}/build-highs-${{matrix.branch}}-b + run: + cmake ${{runner.workspace}}/highs-tests/HiGHS-${{matrix.branch}}-b + + - name: Build, ctest and install HiGHS + working-directory: ${{runner.workspace}}/build-highs-${{matrix.branch}}-b + shell: bash + run: | + cmake --build . --parallel + ctest + + - name: Build CMakeFindHighsPackage + working-directory: ${{runner.workspace}}/build-find-build-${{matrix.branch}} + shell: bash + run: | + cmake ${{runner.workspace}}/highs-tests/CMakeHighsFindPackage-master-${{matrix.branch}}-b \ + -DHIGHS_DIR=${{runner.workspace}}/build-highs-${{matrix.branch}}-b \ + -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-find-build-${{matrix.branch}} + cmake --build . --parallel + cmake --install . + + - name: Test build + working-directory: ${{runner.workspace}}/build-find-build-${{matrix.branch}} + shell: bash + run: | + ./main + + - name: Test install + working-directory: ${{runner.workspace}}/install-find-build-${{matrix.branch}} + shell: bash + run: | + LD_LIBRARY_PATH=${{runner.workspace}}/build-highs-${{matrix.branch}}-b/lib ./bin/main \ No newline at end of file diff --git a/.github/workflows/cmake-find-windows.yml b/.github/workflows/cmake-find-windows.yml index b15e6f3..a3e43dd 100644 --- a/.github/workflows/cmake-find-windows.yml +++ b/.github/workflows/cmake-find-windows.yml @@ -37,9 +37,9 @@ jobs: - name: Configure CMake HiGHS working-directory: ${{runner.workspace}}\\build-highs-${{matrix.branch}} - run: > + run: >- cmake ${{runner.workspace}}\\highs-tests\\HiGHS-${{matrix.branch}} - -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}\\install-highs-${{matrix.branch}} + -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}\\install-highs-${{matrix.branch}} - name: Build, ctest and install HiGHS working-directory: ${{runner.workspace}}\\build-highs-${{matrix.branch}} From 6ba202f5c56d060637add4a2381870825a53683a Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 13:32:31 +0300 Subject: [PATCH 15/28] more wflow --- .github/workflows/cmake-find-windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cmake-find-windows.yml b/.github/workflows/cmake-find-windows.yml index a3e43dd..69c47bd 100644 --- a/.github/workflows/cmake-find-windows.yml +++ b/.github/workflows/cmake-find-windows.yml @@ -50,10 +50,10 @@ jobs: - name: Configure CMakeFindHighsPackage working-directory: ${{runner.workspace}}\\build-find-highs-${{matrix.branch}} - run: > + run: >- cmake ${{runner.workspace}}\\highs-tests\\CMakeHighsFindPackage-master-${{matrix.branch}} - -DHIGHS_DIR=${{runner.workspace}}\\install-highs-${{matrix.branch}}\\lib\\cmake\\highs - -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}\\install-find-highs-${{matrix.branch}} + -DHIGHS_DIR=${{runner.workspace}}\\install-highs-${{matrix.branch}}\\lib\\cmake\\highs + -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}\\install-find-highs-${{matrix.branch}} - name: Build and install CMakeFindHighsPackage working-directory: ${{runner.workspace}}\\build-find-highs-${{matrix.branch}} From 9a62fbed331bcf7cdf02ddea67191a1882143b0f Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 13:38:56 +0300 Subject: [PATCH 16/28] find win exe path and find build macos added --- .github/workflows/cmake-find-build-macos.yml | 70 ++++++++++++++++++++ .github/workflows/cmake-find-windows.yml | 4 +- 2 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/cmake-find-build-macos.yml diff --git a/.github/workflows/cmake-find-build-macos.yml b/.github/workflows/cmake-find-build-macos.yml new file mode 100644 index 0000000..9fe79f1 --- /dev/null +++ b/.github/workflows/cmake-find-build-macos.yml @@ -0,0 +1,70 @@ +name: cmake-find-build-macos + +on: [push, pull_request] + +jobs: + ubuntu: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [macos-latest] + branch: [master, latest, cmake] + + steps: + - uses: actions/checkout@v4 + + - name: Checkout HiGHS repo + uses: actions/checkout@v4 + with: + repository: ERGO-Code/HiGHS + ref: ${{matrix.branch}} + path: HiGHS-${{matrix.branch}}-b + + - name: Checkout CMakeHighsFindPackage + uses: actions/checkout@v4 + with: + repository: galabovaa/CMakeHighsFindPackage + ref: master + path: CMakeHighsFindPackage-master-${{matrix.branch}}-b + + - name: Create build and install dirs + run: | + cmake -E make_directory ${{runner.workspace}}/build-highs-${{matrix.branch}}-b + cmake -E make_directory ${{runner.workspace}}/build-find-build-${{matrix.branch}} + cmake -E make_directory ${{runner.workspace}}/install-find-build-${{matrix.branch}} + + - name: Configure CMake HiGHS + shell: bash + working-directory: ${{runner.workspace}}/build-highs-${{matrix.branch}}-b + run: + cmake ${{runner.workspace}}/highs-tests/HiGHS-${{matrix.branch}}-b + + - name: Build, ctest and install HiGHS + working-directory: ${{runner.workspace}}/build-highs-${{matrix.branch}}-b + shell: bash + run: | + cmake --build . --parallel + ctest + + - name: Build CMakeFindHighsPackage + working-directory: ${{runner.workspace}}/build-find-build-${{matrix.branch}} + shell: bash + run: | + cmake ${{runner.workspace}}/highs-tests/CMakeHighsFindPackage-master-${{matrix.branch}}-b \ + -DHIGHS_DIR=${{runner.workspace}}/build-highs-${{matrix.branch}}-b \ + -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-find-build-${{matrix.branch}} + cmake --build . --parallel + cmake --install . + + - name: Test build + working-directory: ${{runner.workspace}}/build-find-build-${{matrix.branch}} + shell: bash + run: | + ./main + + - name: Test install + working-directory: ${{runner.workspace}}/install-find-build-${{matrix.branch}} + shell: bash + run: | + DYLD_LIBRARY_PATH=${{runner.workspace}}/build-highs-${{matrix.branch}}-b/lib ./bin/main \ No newline at end of file diff --git a/.github/workflows/cmake-find-windows.yml b/.github/workflows/cmake-find-windows.yml index 69c47bd..4036125 100644 --- a/.github/workflows/cmake-find-windows.yml +++ b/.github/workflows/cmake-find-windows.yml @@ -65,10 +65,10 @@ jobs: working-directory: ${{runner.workspace}}\\build-find-highs-${{matrix.branch}} shell: bash run: | - ./main.exe + .\\Release\\main.exe - name: Test install working-directory: ${{runner.workspace}}\\install-find-highs-${{matrix.branch}} shell: bash run: | - ./bin/Release/main.exe \ No newline at end of file + .\\bin\\Release\\main.exe \ No newline at end of file From 33e45000799eced847319280858c0a5c99cb4822 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 13:39:29 +0300 Subject: [PATCH 17/28] path install --- .github/workflows/cmake-find-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake-find-windows.yml b/.github/workflows/cmake-find-windows.yml index 4036125..107ce07 100644 --- a/.github/workflows/cmake-find-windows.yml +++ b/.github/workflows/cmake-find-windows.yml @@ -71,4 +71,4 @@ jobs: working-directory: ${{runner.workspace}}\\install-find-highs-${{matrix.branch}} shell: bash run: | - .\\bin\\Release\\main.exe \ No newline at end of file + .\\bin\\main.exe \ No newline at end of file From 60d0c86f16131a4bbafc89771e7862da553bcaf0 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 13:50:22 +0300 Subject: [PATCH 18/28] added cmake-find-build-windows --- .../workflows/cmake-find-build-windows.yml | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 .github/workflows/cmake-find-build-windows.yml diff --git a/.github/workflows/cmake-find-build-windows.yml b/.github/workflows/cmake-find-build-windows.yml new file mode 100644 index 0000000..b51cbc7 --- /dev/null +++ b/.github/workflows/cmake-find-build-windows.yml @@ -0,0 +1,71 @@ +name: cmake-find-build-windows + +on: [push, pull_request] + +jobs: + ubuntu: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [windows-latest] + branch: [master, latest, cmake] + + steps: + - uses: actions/checkout@v4 + + - name: Checkout HiGHS repo + uses: actions/checkout@v4 + with: + repository: ERGO-Code/HiGHS + ref: ${{matrix.branch}} + path: HiGHS-${{matrix.branch}}-b + + - name: Checkout CMakeHighsFindPackage + uses: actions/checkout@v4 + with: + repository: galabovaa/CMakeHighsFindPackage + ref: master + path: CMakeHighsFindPackage-master-${{matrix.branch}}-b + + - name: Create build and install dirs + run: | + mkdir ${{runner.workspace}}\\build-highs-${{matrix.branch}}-b + mkdir ${{runner.workspace}}\\build-find-build-${{matrix.branch}} + mkdir ${{runner.workspace}}\\install-find-build-${{matrix.branch}} + + - name: Configure CMake HiGHS + working-directory: ${{runner.workspace}}\\build-highs-${{matrix.branch}}-b + run: + cmake ${{runner.workspace}}\\highs-tests\\HiGHS-${{matrix.branch}}-b + + - name: Build, ctest and install HiGHS + working-directory: ${{runner.workspace}}\\build-highs-${{matrix.branch}}-b + run: | + cmake --build . --parallel + ctest + + - name: Configure CMakeFindHighsPackage + working-directory: ${{runner.workspace}}\\build-find-build-${{matrix.branch}} + run: >- + cmake ${{runner.workspace}}\\highs-tests\\CMakeHighsFindPackage-master-${{matrix.branch}}-b + -DHIGHS_DIR=${{runner.workspace}}\\build-highs-${{matrix.branch}}-b + -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}\\install-find-build-${{matrix.branch}} + + - name: Build and install CMakeFindHighsPackage + working-directory: ${{runner.workspace}}\\build-find-build-${{matrix.branch}} + run: | + cmake --build . --parallel --config Release + cmake --install . + + - name: Test build + working-directory: ${{runner.workspace}}\\build-find-build-${{matrix.branch}} + shell: bash + run: | + .\\Release\\main.exe + + - name: Test install + working-directory: ${{runner.workspace}}\\install-find-build-${{matrix.branch}} + shell: bash + run: | + .\\bin\\main.exe \ No newline at end of file From c7f7dfa2fc8d9c4c6788dabc402531d5a312a8f5 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 11:35:03 +0300 Subject: [PATCH 19/28] windows config --- .github/workflows/cmake-find-build-macos.yml | 2 +- .github/workflows/cmake-find-build-windows.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake-find-build-macos.yml b/.github/workflows/cmake-find-build-macos.yml index 9fe79f1..91f5f4e 100644 --- a/.github/workflows/cmake-find-build-macos.yml +++ b/.github/workflows/cmake-find-build-macos.yml @@ -3,7 +3,7 @@ name: cmake-find-build-macos on: [push, pull_request] jobs: - ubuntu: + macos: runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/cmake-find-build-windows.yml b/.github/workflows/cmake-find-build-windows.yml index b51cbc7..7e0ec2c 100644 --- a/.github/workflows/cmake-find-build-windows.yml +++ b/.github/workflows/cmake-find-build-windows.yml @@ -3,7 +3,7 @@ name: cmake-find-build-windows on: [push, pull_request] jobs: - ubuntu: + windows: runs-on: ${{ matrix.os }} strategy: fail-fast: false @@ -42,8 +42,8 @@ jobs: - name: Build, ctest and install HiGHS working-directory: ${{runner.workspace}}\\build-highs-${{matrix.branch}}-b run: | - cmake --build . --parallel - ctest + cmake --build . --parallel --config Release + ctest -C Release - name: Configure CMakeFindHighsPackage working-directory: ${{runner.workspace}}\\build-find-build-${{matrix.branch}} From 1c5cbf4f6a85ad889f3186511b26b14972fe1883 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 12:03:40 +0300 Subject: [PATCH 20/28] tabs --- .github/workflows/cmake-find-build-windows.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake-find-build-windows.yml b/.github/workflows/cmake-find-build-windows.yml index 7e0ec2c..d38d739 100644 --- a/.github/workflows/cmake-find-build-windows.yml +++ b/.github/workflows/cmake-find-build-windows.yml @@ -49,8 +49,8 @@ jobs: working-directory: ${{runner.workspace}}\\build-find-build-${{matrix.branch}} run: >- cmake ${{runner.workspace}}\\highs-tests\\CMakeHighsFindPackage-master-${{matrix.branch}}-b - -DHIGHS_DIR=${{runner.workspace}}\\build-highs-${{matrix.branch}}-b - -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}\\install-find-build-${{matrix.branch}} + -DHIGHS_DIR=${{runner.workspace}}\\build-highs-${{matrix.branch}}-b + -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}\\install-find-build-${{matrix.branch}} - name: Build and install CMakeFindHighsPackage working-directory: ${{runner.workspace}}\\build-find-build-${{matrix.branch}} @@ -64,6 +64,8 @@ jobs: run: | .\\Release\\main.exe + # $env:PATH = 'C:/Users/galab/installs/highs/bin/;' + $env:PATH + - name: Test install working-directory: ${{runner.workspace}}\\install-find-build-${{matrix.branch}} shell: bash From 899edd0aec2fb66b6e3e13ee2f20bedb6651ff40 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 12:11:14 +0300 Subject: [PATCH 21/28] trigger --- .github/workflows/cmake-find-build-windows.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/cmake-find-build-windows.yml b/.github/workflows/cmake-find-build-windows.yml index d38d739..0f443a7 100644 --- a/.github/workflows/cmake-find-build-windows.yml +++ b/.github/workflows/cmake-find-build-windows.yml @@ -64,8 +64,6 @@ jobs: run: | .\\Release\\main.exe - # $env:PATH = 'C:/Users/galab/installs/highs/bin/;' + $env:PATH - - name: Test install working-directory: ${{runner.workspace}}\\install-find-build-${{matrix.branch}} shell: bash From 52b8fb08b9d6b27f5e238f7e4dca0e305cc08176 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 12:20:49 +0300 Subject: [PATCH 22/28] test --- .github/workflows/cmake-find-build-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake-find-build-windows.yml b/.github/workflows/cmake-find-build-windows.yml index 0f443a7..556a21a 100644 --- a/.github/workflows/cmake-find-build-windows.yml +++ b/.github/workflows/cmake-find-build-windows.yml @@ -60,8 +60,8 @@ jobs: - name: Test build working-directory: ${{runner.workspace}}\\build-find-build-${{matrix.branch}} - shell: bash run: | + $env:PATH = '${{runner.workspace}}/build-highs-${{matrix.branch}}-b/bin/Release;' + $env:PATH .\\Release\\main.exe - name: Test install From 3ede10b4127a1e5dde389ba62336087978c99ea8 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 12:32:05 +0300 Subject: [PATCH 23/28] fetch --- .github/workflows/cmake-fetch-linux.yml | 3 +- .github/workflows/cmake-fetch-macos.yml | 47 +++++++++++++++++ .github/workflows/cmake-fetch-windows.yml | 50 +++++++++++++++++++ .../workflows/cmake-find-build-windows.yml | 4 +- .github/workflows/cmake-find-windows.yml | 4 ++ 5 files changed, 105 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/cmake-fetch-macos.yml create mode 100644 .github/workflows/cmake-fetch-windows.yml diff --git a/.github/workflows/cmake-fetch-linux.yml b/.github/workflows/cmake-fetch-linux.yml index 4a66f72..0476f48 100644 --- a/.github/workflows/cmake-fetch-linux.yml +++ b/.github/workflows/cmake-fetch-linux.yml @@ -1,4 +1,4 @@ -name: cmake-fetch-content +name: cmake-fetch-linux on: [push, pull_request] @@ -7,7 +7,6 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - # os: [ubuntu-latest, windows-latest] os: [ubuntu-latest] branch: [master, latest, cmake] diff --git a/.github/workflows/cmake-fetch-macos.yml b/.github/workflows/cmake-fetch-macos.yml new file mode 100644 index 0000000..94d1d1a --- /dev/null +++ b/.github/workflows/cmake-fetch-macos.yml @@ -0,0 +1,47 @@ +name: cmake-fetch-macos + +on: [push, pull_request] + +jobs: + master: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-latest] + branch: [master, latest, cmake] + + steps: + - uses: actions/checkout@v4 + + - name: Checkout CMakeHighsFetchContent + uses: actions/checkout@v4 + with: + repository: galabovaa/CMakeHighsFetchContent + ref: main + path: CMakeHighsFetchContent-main-${{matrix.branch}} + + - name: Create build dir + run: | + cmake -E make_directory ${{runner.workspace}}/build-fetch-${{matrix.branch}} + + - name: Build CMakeFindHighsPackage + working-directory: ${{runner.workspace}}/build-fetch-${{matrix.branch}} + shell: bash + run: | + cmake ${{runner.workspace}}/highs-tests/CMakeHighsFetchContent-main-${{matrix.branch}} \ + -DBRANCH=${{matrix.branch}} \ + -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-fetch-${{matrix.branch}} + cmake --build . --parallel + cmake --install . + + - name: Test + working-directory: ${{runner.workspace}}/build-fetch-${{matrix.branch}} + shell: bash + run: | + ./main + + - name: Test install + working-directory: ${{runner.workspace}}/install-fetch-${{matrix.branch}} + shell: bash + run: | + ./bin/main \ No newline at end of file diff --git a/.github/workflows/cmake-fetch-windows.yml b/.github/workflows/cmake-fetch-windows.yml new file mode 100644 index 0000000..cc82088 --- /dev/null +++ b/.github/workflows/cmake-fetch-windows.yml @@ -0,0 +1,50 @@ +name: cmake-fetch-windows + +on: [push, pull_request] + +jobs: + master: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [windows-latest] + branch: [master, latest, cmake] + + steps: + - uses: actions/checkout@v4 + + - name: Checkout CMakeHighsFetchContent + uses: actions/checkout@v4 + with: + repository: galabovaa/CMakeHighsFetchContent + ref: main + path: CMakeHighsFetchContent-main-${{matrix.branch}} + + - name: Create build dir + run: | + mkdir ${{runner.workspace}}\\build-fetch-${{matrix.branch}} + + - name: Configure CMakeFindHighsPackage + working-directory: ${{runner.workspace}}\\build-fetch-${{matrix.branch}} + run: >- + cmake ${{runner.workspace}}\\highs-tests\\CMakeHighsFetchContent-main-${{matrix.branch}} + -DBRANCH=${{matrix.branch}} + -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/install-fetch-${{matrix.branch}} + + - name: Build CMakeFindHighsPackage + working-directory: ${{runner.workspace}}\\build-fetch-${{matrix.branch}} + run: | + cmake --build . --parallel + cmake --install . + + - name: Test + working-directory: ${{runner.workspace}}\\build-fetch-${{matrix.branch}} + shell: bash + run: | + ./main + + - name: Test install + working-directory: ${{runner.workspace}}\\install-fetch-${{matrix.branch}} + shell: bash + run: | + ./bin/main \ No newline at end of file diff --git a/.github/workflows/cmake-find-build-windows.yml b/.github/workflows/cmake-find-build-windows.yml index 556a21a..a71a56b 100644 --- a/.github/workflows/cmake-find-build-windows.yml +++ b/.github/workflows/cmake-find-build-windows.yml @@ -62,10 +62,12 @@ jobs: working-directory: ${{runner.workspace}}\\build-find-build-${{matrix.branch}} run: | $env:PATH = '${{runner.workspace}}/build-highs-${{matrix.branch}}-b/bin/Release;' + $env:PATH + echo $Env:PATH .\\Release\\main.exe - name: Test install working-directory: ${{runner.workspace}}\\install-find-build-${{matrix.branch}} - shell: bash run: | + $env:PATH = '${{runner.workspace}}/build-highs-${{matrix.branch}}-b/bin/Release;' + $env:PATH + echo $Env:PATH .\\bin\\main.exe \ No newline at end of file diff --git a/.github/workflows/cmake-find-windows.yml b/.github/workflows/cmake-find-windows.yml index 107ce07..3aee9d2 100644 --- a/.github/workflows/cmake-find-windows.yml +++ b/.github/workflows/cmake-find-windows.yml @@ -65,10 +65,14 @@ jobs: working-directory: ${{runner.workspace}}\\build-find-highs-${{matrix.branch}} shell: bash run: | + $env:PATH = '${{runner.workspace}}/install-highs-${{matrix.branch}}/bin/Release;' + $env:PATH + echo $Env:PATH .\\Release\\main.exe - name: Test install working-directory: ${{runner.workspace}}\\install-find-highs-${{matrix.branch}} shell: bash run: | + $env:PATH = '${{runner.workspace}}/install-highs-${{matrix.branch}}/bin/Release;' + $env:PATH + echo $Env:PATH .\\bin\\main.exe \ No newline at end of file From 671ccce537bd3bd6a6dcbfb09e11b7ef67fe1d17 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 12:51:33 +0300 Subject: [PATCH 24/28] readme --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d8b0d05..370e28d 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -# highs-tests \ No newline at end of file +# highs-tests + +Repository for tests of HiGHS during development and for releases. \ No newline at end of file From db8215bc976b621efa6e331bcb295e70c25f2285 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 13:01:29 +0300 Subject: [PATCH 25/28] config release --- .github/workflows/cmake-fetch-linux.yml | 1 + .github/workflows/cmake-fetch-macos.yml | 1 + .github/workflows/cmake-fetch-windows.yml | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake-fetch-linux.yml b/.github/workflows/cmake-fetch-linux.yml index 0476f48..9dcbddc 100644 --- a/.github/workflows/cmake-fetch-linux.yml +++ b/.github/workflows/cmake-fetch-linux.yml @@ -6,6 +6,7 @@ jobs: master: runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: os: [ubuntu-latest] branch: [master, latest, cmake] diff --git a/.github/workflows/cmake-fetch-macos.yml b/.github/workflows/cmake-fetch-macos.yml index 94d1d1a..066675e 100644 --- a/.github/workflows/cmake-fetch-macos.yml +++ b/.github/workflows/cmake-fetch-macos.yml @@ -6,6 +6,7 @@ jobs: master: runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: os: [macos-latest] branch: [master, latest, cmake] diff --git a/.github/workflows/cmake-fetch-windows.yml b/.github/workflows/cmake-fetch-windows.yml index cc82088..f3ed872 100644 --- a/.github/workflows/cmake-fetch-windows.yml +++ b/.github/workflows/cmake-fetch-windows.yml @@ -6,6 +6,7 @@ jobs: master: runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: os: [windows-latest] branch: [master, latest, cmake] @@ -34,7 +35,7 @@ jobs: - name: Build CMakeFindHighsPackage working-directory: ${{runner.workspace}}\\build-fetch-${{matrix.branch}} run: | - cmake --build . --parallel + cmake --build . --parallel --config Release cmake --install . - name: Test From 43d92f918e7dbeae2d52032f40f22177cf2d2d58 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 13:07:54 +0300 Subject: [PATCH 26/28] path to exe --- .github/workflows/cmake-fetch-windows.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cmake-fetch-windows.yml b/.github/workflows/cmake-fetch-windows.yml index f3ed872..ed1247c 100644 --- a/.github/workflows/cmake-fetch-windows.yml +++ b/.github/workflows/cmake-fetch-windows.yml @@ -40,12 +40,11 @@ jobs: - name: Test working-directory: ${{runner.workspace}}\\build-fetch-${{matrix.branch}} - shell: bash run: | - ./main + .\\Release\\main.exe - name: Test install working-directory: ${{runner.workspace}}\\install-fetch-${{matrix.branch}} shell: bash run: | - ./bin/main \ No newline at end of file + .\\bin\\main.exe \ No newline at end of file From 363e289edc57c239978aa0863a303f7239af5492 Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 13:09:34 +0300 Subject: [PATCH 27/28] pwsh --- .github/workflows/cmake-find-windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake-find-windows.yml b/.github/workflows/cmake-find-windows.yml index 3aee9d2..276e669 100644 --- a/.github/workflows/cmake-find-windows.yml +++ b/.github/workflows/cmake-find-windows.yml @@ -63,7 +63,7 @@ jobs: - name: Test build working-directory: ${{runner.workspace}}\\build-find-highs-${{matrix.branch}} - shell: bash + shell: pwsh run: | $env:PATH = '${{runner.workspace}}/install-highs-${{matrix.branch}}/bin/Release;' + $env:PATH echo $Env:PATH @@ -71,7 +71,7 @@ jobs: - name: Test install working-directory: ${{runner.workspace}}\\install-find-highs-${{matrix.branch}} - shell: bash + shell: pwsh run: | $env:PATH = '${{runner.workspace}}/install-highs-${{matrix.branch}}/bin/Release;' + $env:PATH echo $Env:PATH From 63091bc6ff72e301de51e52517040237c989121f Mon Sep 17 00:00:00 2001 From: Ivet Galabova Date: Tue, 8 Apr 2025 13:24:57 +0300 Subject: [PATCH 28/28] better names, all tests as expected --- .github/workflows/cmake-fetch-linux.yml | 2 +- .github/workflows/cmake-fetch-macos.yml | 2 +- .github/workflows/cmake-fetch-windows.yml | 2 +- .github/workflows/cmake-find-build-linux.yml | 2 +- .github/workflows/cmake-find-build-macos.yml | 2 +- .github/workflows/cmake-find-build-windows.yml | 2 +- .github/workflows/cmake-find-linux.yml | 2 +- .github/workflows/cmake-find-macos.yml | 2 +- .github/workflows/cmake-find-windows.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cmake-fetch-linux.yml b/.github/workflows/cmake-fetch-linux.yml index 9dcbddc..e7bf155 100644 --- a/.github/workflows/cmake-fetch-linux.yml +++ b/.github/workflows/cmake-fetch-linux.yml @@ -3,7 +3,7 @@ name: cmake-fetch-linux on: [push, pull_request] jobs: - master: + fetch_ubuntu: runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/cmake-fetch-macos.yml b/.github/workflows/cmake-fetch-macos.yml index 066675e..2467143 100644 --- a/.github/workflows/cmake-fetch-macos.yml +++ b/.github/workflows/cmake-fetch-macos.yml @@ -3,7 +3,7 @@ name: cmake-fetch-macos on: [push, pull_request] jobs: - master: + fetch_macos: runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/cmake-fetch-windows.yml b/.github/workflows/cmake-fetch-windows.yml index ed1247c..bf08188 100644 --- a/.github/workflows/cmake-fetch-windows.yml +++ b/.github/workflows/cmake-fetch-windows.yml @@ -3,7 +3,7 @@ name: cmake-fetch-windows on: [push, pull_request] jobs: - master: + fetch_win: runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/cmake-find-build-linux.yml b/.github/workflows/cmake-find-build-linux.yml index ee67685..788ed96 100644 --- a/.github/workflows/cmake-find-build-linux.yml +++ b/.github/workflows/cmake-find-build-linux.yml @@ -3,7 +3,7 @@ name: cmake-find-build-linux on: [push, pull_request] jobs: - ubuntu: + find_b_ubuntu: runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/cmake-find-build-macos.yml b/.github/workflows/cmake-find-build-macos.yml index 91f5f4e..394294e 100644 --- a/.github/workflows/cmake-find-build-macos.yml +++ b/.github/workflows/cmake-find-build-macos.yml @@ -3,7 +3,7 @@ name: cmake-find-build-macos on: [push, pull_request] jobs: - macos: + find_b_macos: runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/cmake-find-build-windows.yml b/.github/workflows/cmake-find-build-windows.yml index a71a56b..36f0820 100644 --- a/.github/workflows/cmake-find-build-windows.yml +++ b/.github/workflows/cmake-find-build-windows.yml @@ -3,7 +3,7 @@ name: cmake-find-build-windows on: [push, pull_request] jobs: - windows: + find_b_win: runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/cmake-find-linux.yml b/.github/workflows/cmake-find-linux.yml index 23666b6..1904cbb 100644 --- a/.github/workflows/cmake-find-linux.yml +++ b/.github/workflows/cmake-find-linux.yml @@ -3,7 +3,7 @@ name: cmake-find-linux on: [push, pull_request] jobs: - ubuntu: + find_i_ubuntu: runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/cmake-find-macos.yml b/.github/workflows/cmake-find-macos.yml index 5e6ebea..5d92b11 100644 --- a/.github/workflows/cmake-find-macos.yml +++ b/.github/workflows/cmake-find-macos.yml @@ -3,7 +3,7 @@ name: cmake-find-macos on: [push, pull_request] jobs: - macos: + find_i_macos: runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/cmake-find-windows.yml b/.github/workflows/cmake-find-windows.yml index 276e669..b2df4ef 100644 --- a/.github/workflows/cmake-find-windows.yml +++ b/.github/workflows/cmake-find-windows.yml @@ -3,7 +3,7 @@ name: cmake-find-windows on: [push, pull_request] jobs: - windows: + find_i_win: runs-on: ${{ matrix.os }} strategy: fail-fast: false