From 5d35523f363d35df851a66ae2510f5003e802604 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Tue, 2 Jan 2024 12:01:04 +0100 Subject: [PATCH 01/35] print output --- .github/workflows/new_release.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/new_release.yml b/.github/workflows/new_release.yml index 5a4c77da34..e07372c624 100644 --- a/.github/workflows/new_release.yml +++ b/.github/workflows/new_release.yml @@ -29,6 +29,12 @@ jobs: body: | Please complete description + - name: print output + id: print-output + run: "echo ${{ steps.create_release.outputs.upload_url }}" + shell: bash + + ubuntu: name: Release - Ubuntu From d9ab701a0137078627c11852c53c6bcb5e446234 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Tue, 2 Jan 2024 12:18:19 +0100 Subject: [PATCH 02/35] test gh cli --- .github/workflows/new_release.yml | 64 +++++++++++++++++++------------ 1 file changed, 39 insertions(+), 25 deletions(-) diff --git a/.github/workflows/new_release.yml b/.github/workflows/new_release.yml index e07372c624..90aedb82c0 100644 --- a/.github/workflows/new_release.yml +++ b/.github/workflows/new_release.yml @@ -13,32 +13,46 @@ on: description: "Run all tests (true/false)" required: true jobs: - release: - runs-on: ubuntu-20.04 - outputs: - url: ${{ steps.create_release.outputs.upload_url }} - steps: - - name: Release creation - uses: actions/create-release@v1 - id: create_release - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.event.inputs.release_tag }} - release_name: ${{ github.event.inputs.release_name }} - body: | - Please complete description + # release: + # runs-on: ubuntu-20.04 + # outputs: + # url: ${{ steps.create_release.outputs.upload_url }} + # steps: + # - name: Release creation + # uses: actions/create-release@v1 + # id: create_release + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # tag_name: ${{ github.event.inputs.release_tag }} + # release_name: ${{ github.event.inputs.release_name }} + # body: | + # Please complete description + release: + name: Release pushed tag + runs-on: ubuntu-20.04 + steps: + - name: Create release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + tag: ${{ github.event.inputs.release_tag }} + title: ${{ github.event.inputs.release_name }} + run: | + gh release create "$tag" \ + --repo="$GITHUB_REPOSITORY" \ + --title="$title" \ + --generate-notes - - name: print output - id: print-output - run: "echo ${{ steps.create_release.outputs.upload_url }}" - shell: bash + # - name: print output + # id: print-output + # run: "echo ${{ steps.create_release.outputs.upload_url }}" + # shell: bash - ubuntu: - name: Release - Ubuntu - needs: release - uses: ./.github/workflows/ubuntu.yml - with: - run-tests: ${{ fromJSON(inputs.run-tests) }} + # ubuntu: + # name: Release - Ubuntu + # needs: release + # uses: ./.github/workflows/ubuntu.yml + # with: + # run-tests: ${{ fromJSON(inputs.run-tests) }} From 42a2ff1cf1c03b70e72e8f819cd810a11fa79491 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Tue, 2 Jan 2024 12:38:57 +0100 Subject: [PATCH 03/35] test gh upload --- .github/workflows/new_release.yml | 13 +++++++------ .github/workflows/ubuntu.yml | 21 +++++++++++++++++---- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.github/workflows/new_release.yml b/.github/workflows/new_release.yml index 90aedb82c0..6e7e110158 100644 --- a/.github/workflows/new_release.yml +++ b/.github/workflows/new_release.yml @@ -50,9 +50,10 @@ jobs: - # ubuntu: - # name: Release - Ubuntu - # needs: release - # uses: ./.github/workflows/ubuntu.yml - # with: - # run-tests: ${{ fromJSON(inputs.run-tests) }} + ubuntu: + name: Release - Ubuntu + needs: release + uses: ./.github/workflows/ubuntu.yml + with: + run-tests: ${{ fromJSON(inputs.run-tests) }} + # tag_name: ${{ github.event.inputs.release_tag }} diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index c733f8bf0d..546286f3bb 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -17,6 +17,9 @@ on: run-tests: required: true type: boolean + # tag_name: + # required: true + # type: string env: GITHUB_TOKEN: ${{ github.token }} @@ -277,10 +280,20 @@ jobs: with: path: _build/*.deb + # - name: Publish assets + # if: ${{ env.IS_RELEASE == 'true' }} + # uses: alexellis/upload-assets@0.4.0 + # env: + # GITHUB_TOKEN: ${{ github.token }} + # with: + # asset_paths: '["_build/*.tar.gz", "_build/*.deb"]' + + - name: Publish assets if: ${{ env.IS_RELEASE == 'true' }} - uses: alexellis/upload-assets@0.4.0 env: - GITHUB_TOKEN: ${{ github.token }} - with: - asset_paths: '["_build/*.tar.gz", "_build/*.deb"]' + GITHUB_TOKEN: ${{ github.token }} + tag: ${{ github.event.inputs.tag_name }} + title: ${{ github.event.inputs.release_name }} + run: | + gh release upload "$tag" _build/*.tar.gz _build/*.deb From 72dc932f3da57de3b4593f6cd949e794ec0f5417 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Tue, 2 Jan 2024 12:49:06 +0100 Subject: [PATCH 04/35] test --- .github/workflows/ubuntu.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 546286f3bb..94e34e8ada 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -26,6 +26,7 @@ env: IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} RUN_SIMPLE_TESTS: ${{ github.event_name == 'push' || inputs.run-tests == 'true' }} RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule' || inputs.run-tests == 'true' }} + # TAG_NAME: $${{inputs.tag_name}} jobs: @@ -293,7 +294,7 @@ jobs: if: ${{ env.IS_RELEASE == 'true' }} env: GITHUB_TOKEN: ${{ github.token }} - tag: ${{ github.event.inputs.tag_name }} + tag: ${{ github.event.inputs.release_tag }} title: ${{ github.event.inputs.release_name }} run: | gh release upload "$tag" _build/*.tar.gz _build/*.deb From 2c3c536825dd228b32137caf8baf91707e08eaad Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Tue, 2 Jan 2024 15:13:00 +0100 Subject: [PATCH 05/35] release windows without tests --- .github/workflows/new_release.yml | 28 +++-------- .github/workflows/ubuntu.yml | 12 ----- .github/workflows/windows-vcpkg.yml | 74 ++++++++++++++++++++--------- 3 files changed, 58 insertions(+), 56 deletions(-) diff --git a/.github/workflows/new_release.yml b/.github/workflows/new_release.yml index 6e7e110158..440e823b13 100644 --- a/.github/workflows/new_release.yml +++ b/.github/workflows/new_release.yml @@ -13,21 +13,6 @@ on: description: "Run all tests (true/false)" required: true jobs: - # release: - # runs-on: ubuntu-20.04 - # outputs: - # url: ${{ steps.create_release.outputs.upload_url }} - # steps: - # - name: Release creation - # uses: actions/create-release@v1 - # id: create_release - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # tag_name: ${{ github.event.inputs.release_tag }} - # release_name: ${{ github.event.inputs.release_name }} - # body: | - # Please complete description release: name: Release pushed tag runs-on: ubuntu-20.04 @@ -43,11 +28,6 @@ jobs: --title="$title" \ --generate-notes - # - name: print output - # id: print-output - # run: "echo ${{ steps.create_release.outputs.upload_url }}" - # shell: bash - ubuntu: @@ -56,4 +36,10 @@ jobs: uses: ./.github/workflows/ubuntu.yml with: run-tests: ${{ fromJSON(inputs.run-tests) }} - # tag_name: ${{ github.event.inputs.release_tag }} + + windows: + name: Release - Windows + needs: release + uses: ./.github/workflows/windows-vcpkg.yml + with: + run-tests: ${{ fromJSON(inputs.run-tests) }} diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 94e34e8ada..2289f86338 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -17,16 +17,12 @@ on: run-tests: required: true type: boolean - # tag_name: - # required: true - # type: string env: GITHUB_TOKEN: ${{ github.token }} IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} RUN_SIMPLE_TESTS: ${{ github.event_name == 'push' || inputs.run-tests == 'true' }} RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule' || inputs.run-tests == 'true' }} - # TAG_NAME: $${{inputs.tag_name}} jobs: @@ -280,14 +276,6 @@ jobs: uses: actions/upload-artifact@v3 with: path: _build/*.deb - - # - name: Publish assets - # if: ${{ env.IS_RELEASE == 'true' }} - # uses: alexellis/upload-assets@0.4.0 - # env: - # GITHUB_TOKEN: ${{ github.token }} - # with: - # asset_paths: '["_build/*.tar.gz", "_build/*.deb"]' - name: Publish assets diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index e6a3b3d747..78948ca825 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -12,6 +12,18 @@ on: - doc/* schedule: - cron: '21 2 * * *' + workflow_call: + inputs: + run-tests: + required: true + type: boolean + +env: + GITHUB_TOKEN: ${{ github.token }} + IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} + RUN_SIMPLE_TESTS: ${{ github.event_name == 'push' || inputs.run-tests == 'true' }} + RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule' || inputs.run-tests == 'true' }} + jobs: windows: @@ -31,7 +43,6 @@ jobs: VCPKG_ROOT: ${{ github.workspace }}/vcpkg ORTOOLS_DIR: ${{ github.workspace }}/or-tools ORTOOLS_URL: "https://github.com/rte-france/or-tools/releases/download/v9.5-rte2.0/ortools_cxx_windows-latest_static_sirius.zip" - RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule'}} steps: - uses: actions/checkout@v3 @@ -140,13 +151,31 @@ jobs: shell: bash run: | cmake --build _build --config release -j2 + # simtest + - name: Read simtest version + id: simtest-version + uses: notiz-dev/github-action-json-property@release + with: + path: 'simtest.json' + prop_path: 'version' + + - name: Run named mps tests + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: valid-named-mps + os: ${{ matrix.test-platform }} + variant: "named-mps" - name: Run unfeasibility-related tests + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} run: | cd _build ctest -C Release --output-on-failure -R "^unfeasible$" - name: Run unit and end-to-end tests + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} run: | cd _build ctest -C ${{ matrix.buildtype }} --output-on-failure -L "unit|end-to-end" -LE ortools @@ -158,23 +187,9 @@ jobs: name: MPS-diff path: ${{ github.workspace }}/src/tests/mps - # simtest - - name: Read simtest version - id: simtest-version - uses: notiz-dev/github-action-json-property@release - with: - path: 'simtest.json' - prop_path: 'version' - - - name: Run named mps tests - uses: ./.github/workflows/run-tests - with: - simtest-tag: ${{steps.simtest-version.outputs.prop}} - batch-name: valid-named-mps - os: ${{ matrix.test-platform }} - variant: "named-mps" - + - name: Run tests for adequacy patch (CSR) + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} @@ -182,6 +197,7 @@ jobs: os: ${{ matrix.test-platform }} - name: Run tests about infinity on BCs RHS + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} @@ -189,7 +205,7 @@ jobs: os: ${{ matrix.test-platform }} - name: Run MILP with CBC - if: ${{ env.IS_PUSH == 'true' }} + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} @@ -198,6 +214,7 @@ jobs: os: ${{ matrix.test-platform }} - name: Run tests introduced in v860 + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} @@ -205,7 +222,7 @@ jobs: os: ${{ matrix.test-platform }} - name: Run tests introduced in v870 - if: ${{ env.IS_PUSH == 'true' }} + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} @@ -213,6 +230,7 @@ jobs: os: ${{ matrix.test-platform }} - name: Run short-tests + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} @@ -220,6 +238,7 @@ jobs: os: ${{ matrix.test-platform }} - name: Run mps tests + if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} @@ -299,7 +318,16 @@ jobs: with: path: _build/${{env.NSIS_NAME}} - - name: Archive upload - uses: actions/upload-artifact@v3 - with: - path: _build/*.zip + # - name: Archive upload + # uses: actions/upload-artifact@v3 + # with: + # path: _build/*.zip + + - name: Publish assets + if: ${{ env.IS_RELEASE == 'true' }} + env: + GITHUB_TOKEN: ${{ github.token }} + tag: ${{ github.event.inputs.release_tag }} + title: ${{ github.event.inputs.release_name }} + run: | + gh release upload "$tag" _build/*.zip From 08917c8e0229fd8d2a2bbedab58dea7b6bc4ef52 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Tue, 2 Jan 2024 15:28:03 +0100 Subject: [PATCH 06/35] try another shell --- .github/workflows/windows-vcpkg.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 78948ca825..c6173faa2c 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -331,3 +331,4 @@ jobs: title: ${{ github.event.inputs.release_name }} run: | gh release upload "$tag" _build/*.zip + shell: bash From 12c4059aabeae10723dfa5b22134e5003ce9e06b Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Mon, 8 Jan 2024 10:30:28 +0100 Subject: [PATCH 07/35] new centos release --- .github/workflows/centos7.yml | 16 ++++++++++------ .github/workflows/new_release.yml | 7 +++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 10c2c59b0e..9b4c31d98a 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -8,10 +8,15 @@ on: - develop schedule: - cron: '21 2 * * *' + workflow_call: + inputs: + run-tests: + required: true + type: boolean env: GITHUB_TOKEN: ${{ github.token }} - IS_RELEASE: ${{ github.event_name == 'release' && github.event.action == 'created' }} + IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} IS_PUSH: ${{ github.event_name == 'push' }} jobs: @@ -120,11 +125,10 @@ jobs: if: ${{ env.IS_RELEASE == 'true' }} uses: actions/download-artifact@v3 - - name: Publish assets if: ${{ env.IS_RELEASE == 'true' }} - uses: alexellis/upload-assets@0.4.0 env: - GITHUB_TOKEN: ${{ github.token }} - with: - asset_paths: '["*/*.tar.gz", "*/*.rpm"]' + GITHUB_TOKEN: ${{ github.token }} + tag: ${{ github.event.inputs.release_tag }} + run: | + gh release upload "$tag" */*.tar.gz */*.rpm diff --git a/.github/workflows/new_release.yml b/.github/workflows/new_release.yml index 440e823b13..ce37e48623 100644 --- a/.github/workflows/new_release.yml +++ b/.github/workflows/new_release.yml @@ -43,3 +43,10 @@ jobs: uses: ./.github/workflows/windows-vcpkg.yml with: run-tests: ${{ fromJSON(inputs.run-tests) }} + + centos7: + name: Release - centos7 + needs: release + uses: ./.github/workflows/centos7.yml + with: + run-tests: ${{ fromJSON(inputs.run-tests) }} From 18cd4f9ae4d499411241e8d2c172b3f74ef7f7e9 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Mon, 8 Jan 2024 10:31:39 +0100 Subject: [PATCH 08/35] remove unnecessary option --- .github/workflows/ubuntu.yml | 1 - .github/workflows/windows-vcpkg.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 2289f86338..080c84a82f 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -283,6 +283,5 @@ jobs: env: GITHUB_TOKEN: ${{ github.token }} tag: ${{ github.event.inputs.release_tag }} - title: ${{ github.event.inputs.release_name }} run: | gh release upload "$tag" _build/*.tar.gz _build/*.deb diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index c6173faa2c..e24cac03e5 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -328,7 +328,6 @@ jobs: env: GITHUB_TOKEN: ${{ github.token }} tag: ${{ github.event.inputs.release_tag }} - title: ${{ github.event.inputs.release_name }} run: | gh release upload "$tag" _build/*.zip shell: bash From b17b9e2a49d89bb5774fa97d36f1e0379d8331c2 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Mon, 8 Jan 2024 10:35:07 +0100 Subject: [PATCH 09/35] all in one job --- .github/workflows/centos7.yml | 14 ++------------ .github/workflows/windows-vcpkg.yml | 5 ----- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 9b4c31d98a..89fd70acc4 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -114,21 +114,11 @@ jobs: uses: actions/upload-artifact@v3 with: path: _build/*.rpm - - publish_assets: - name: Publish assets - needs: build - runs-on: ubuntu-latest - - steps: - - name: Download all artifacts - if: ${{ env.IS_RELEASE == 'true' }} - uses: actions/download-artifact@v3 - + - name: Publish assets if: ${{ env.IS_RELEASE == 'true' }} env: GITHUB_TOKEN: ${{ github.token }} tag: ${{ github.event.inputs.release_tag }} run: | - gh release upload "$tag" */*.tar.gz */*.rpm + gh release upload "$tag" _build/*.tar.gz _build/*.rpm diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index e24cac03e5..74572e1d44 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -318,11 +318,6 @@ jobs: with: path: _build/${{env.NSIS_NAME}} - # - name: Archive upload - # uses: actions/upload-artifact@v3 - # with: - # path: _build/*.zip - - name: Publish assets if: ${{ env.IS_RELEASE == 'true' }} env: From 5ebcd2de00327cf4beae10db8812472ea0d61510 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Mon, 8 Jan 2024 10:51:24 +0100 Subject: [PATCH 10/35] hope --- .github/workflows/centos7.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 89fd70acc4..9b4c31d98a 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -114,11 +114,21 @@ jobs: uses: actions/upload-artifact@v3 with: path: _build/*.rpm - + + publish_assets: + name: Publish assets + needs: build + runs-on: ubuntu-latest + + steps: + - name: Download all artifacts + if: ${{ env.IS_RELEASE == 'true' }} + uses: actions/download-artifact@v3 + - name: Publish assets if: ${{ env.IS_RELEASE == 'true' }} env: GITHUB_TOKEN: ${{ github.token }} tag: ${{ github.event.inputs.release_tag }} run: | - gh release upload "$tag" _build/*.tar.gz _build/*.rpm + gh release upload "$tag" */*.tar.gz */*.rpm From bd7a0c8187146281420e1fec8a32248d2020e31b Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Tue, 9 Jan 2024 17:50:22 +0100 Subject: [PATCH 11/35] install gh --- .github/workflows/centos7.yml | 5 +++++ .github/workflows/new_release.yml | 7 +++++++ .github/workflows/oracle8.yml | 21 +++++++++++++++------ 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index bb900b886c..9f265c7f56 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -124,6 +124,11 @@ jobs: - name: Download all artifacts if: ${{ env.IS_RELEASE == 'true' }} uses: actions/download-artifact@v3 + + - name: install gh + run: | + sudo apt-get update + sudo apt install gh - name: Publish assets if: ${{ env.IS_RELEASE == 'true' }} diff --git a/.github/workflows/new_release.yml b/.github/workflows/new_release.yml index ce37e48623..21997ad210 100644 --- a/.github/workflows/new_release.yml +++ b/.github/workflows/new_release.yml @@ -50,3 +50,10 @@ jobs: uses: ./.github/workflows/centos7.yml with: run-tests: ${{ fromJSON(inputs.run-tests) }} + + oracle8: + name: Release - oracle8 + needs: release + uses: ./.github/workflows/oracle8.yml + with: + run-tests: ${{ fromJSON(inputs.run-tests) }} diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index 75c05f845f..3d8e344d3e 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -8,10 +8,15 @@ on: - develop schedule: - cron: '21 2 * * *' + workflow_call: + inputs: + run-tests: + required: true + type: boolean env: GITHUB_TOKEN: ${{ github.token }} - IS_RELEASE: ${{ github.event_name == 'release' && github.event.action == 'created' }} + IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} IS_PUSH: ${{ github.event_name == 'push' }} jobs: @@ -108,12 +113,16 @@ jobs: - name: Download all artifacts if: ${{ env.IS_RELEASE == 'true' }} uses: actions/download-artifact@v3 - + + - name: install gh + run: | + sudo apt-get update + sudo apt install gh - name: Publish assets if: ${{ env.IS_RELEASE == 'true' }} - uses: alexellis/upload-assets@0.4.0 env: - GITHUB_TOKEN: ${{ github.token }} - with: - asset_paths: '["*/*.tar.gz", "*/*.rpm"]' + GITHUB_TOKEN: ${{ github.token }} + tag: ${{ github.event.inputs.release_tag }} + run: | + gh release upload "$tag" */*.tar.gz */*.rpm From e3d84693c49c6edc5acc82b851e4290eefb38ff2 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Tue, 9 Jan 2024 18:13:50 +0100 Subject: [PATCH 12/35] install gh --- .github/workflows/centos7.yml | 21 ++++----------------- .github/workflows/oracle8.yml | 20 +++----------------- 2 files changed, 7 insertions(+), 34 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 9f265c7f56..19273fd38c 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -61,7 +61,7 @@ jobs: - name: Install gcc 10 run: | - yum install -y centos-release-scl + yum install -y centos-release-scl gh yum install -y devtoolset-10-gcc* - name: Configure @@ -115,25 +115,12 @@ jobs: with: path: _build/*.rpm - publish_assets: - name: Publish assets - needs: build - runs-on: ubuntu-latest - - steps: - - name: Download all artifacts - if: ${{ env.IS_RELEASE == 'true' }} - uses: actions/download-artifact@v3 - - - name: install gh - run: | - sudo apt-get update - sudo apt install gh - - name: Publish assets if: ${{ env.IS_RELEASE == 'true' }} env: GITHUB_TOKEN: ${{ github.token }} tag: ${{ github.event.inputs.release_tag }} run: | - gh release upload "$tag" */*.tar.gz */*.rpm + gh release upload "$tag" _build/*.tar.gz _build/*.rpm + + \ No newline at end of file diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index 3d8e344d3e..9f37a12a13 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -38,7 +38,7 @@ jobs: - name: Install libraries run: | - dnf install -y epel-release git cmake wget rpm-build redhat-lsb-core + dnf install -y epel-release git cmake wget rpm-build redhat-lsb-core gh dnf install -y unzip libuuid-devel boost-test boost-devel gcc-toolset-10-toolchain zlib-devel - name: Checkout @@ -104,25 +104,11 @@ jobs: with: path: _build/*.rpm - publish_assets: - name: Publish assets - needs: build - runs-on: ubuntu-latest - - steps: - - name: Download all artifacts - if: ${{ env.IS_RELEASE == 'true' }} - uses: actions/download-artifact@v3 - - - name: install gh - run: | - sudo apt-get update - sudo apt install gh - - name: Publish assets if: ${{ env.IS_RELEASE == 'true' }} env: GITHUB_TOKEN: ${{ github.token }} tag: ${{ github.event.inputs.release_tag }} run: | - gh release upload "$tag" */*.tar.gz */*.rpm + gh release upload "$tag" _build/*.tar.gz _build/*.rpm + From 93c18ba9b2a5d71630f103af993190ec69bbce28 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Wed, 10 Jan 2024 10:18:36 +0100 Subject: [PATCH 13/35] hew & elastic --- .github/workflows/centos7.yml | 9 ++++++++- .github/workflows/oracle8.yml | 8 +++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 19273fd38c..0b397692c3 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -61,7 +61,7 @@ jobs: - name: Install gcc 10 run: | - yum install -y centos-release-scl gh + yum install -y centos-release-scl yum install -y devtoolset-10-gcc* - name: Configure @@ -115,6 +115,13 @@ jobs: with: path: _build/*.rpm + - name: Install gh + run: | + yum install dnf + dnf install 'dnf-command(config-manager)' + dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo + dnf install gh + - name: Publish assets if: ${{ env.IS_RELEASE == 'true' }} env: diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index 9f37a12a13..1c6b58b01b 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -38,7 +38,7 @@ jobs: - name: Install libraries run: | - dnf install -y epel-release git cmake wget rpm-build redhat-lsb-core gh + dnf install -y epel-release git cmake wget rpm-build redhat-lsb-core dnf install -y unzip libuuid-devel boost-test boost-devel gcc-toolset-10-toolchain zlib-devel - name: Checkout @@ -104,6 +104,12 @@ jobs: with: path: _build/*.rpm + - name: Install gh + run: | + dnf install 'dnf-command(config-manager)' + dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo + dnf install gh + - name: Publish assets if: ${{ env.IS_RELEASE == 'true' }} env: From 4d990aaeefbb0b01eecce89c3b98dce11ae7be09 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Wed, 10 Jan 2024 10:22:42 +0100 Subject: [PATCH 14/35] cut-off plastic --- .github/workflows/centos7.yml | 3 ++- .github/workflows/oracle8.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 0b397692c3..7c43e757eb 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -116,12 +116,13 @@ jobs: path: _build/*.rpm - name: Install gh + if: ${{ env.IS_RELEASE == 'true' }} run: | yum install dnf dnf install 'dnf-command(config-manager)' dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo dnf install gh - + - name: Publish assets if: ${{ env.IS_RELEASE == 'true' }} env: diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index 1c6b58b01b..d4f32e4ef4 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -105,6 +105,7 @@ jobs: path: _build/*.rpm - name: Install gh + if: ${{ env.IS_RELEASE == 'true' }} run: | dnf install 'dnf-command(config-manager)' dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo From 256284637b44487d95783defd507cd74dca4d121 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Wed, 10 Jan 2024 10:38:46 +0100 Subject: [PATCH 15/35] yes sir --- .github/workflows/centos7.yml | 8 ++++---- .github/workflows/oracle8.yml | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 7c43e757eb..8ef8ca5a7a 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -118,10 +118,10 @@ jobs: - name: Install gh if: ${{ env.IS_RELEASE == 'true' }} run: | - yum install dnf - dnf install 'dnf-command(config-manager)' - dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo - dnf install gh + yum -y install dnf + dnf -y install 'dnf-command(config-manager)' + dnf -y config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo + dnf -y install gh - name: Publish assets if: ${{ env.IS_RELEASE == 'true' }} diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml index d4f32e4ef4..2c0ea15c5e 100644 --- a/.github/workflows/oracle8.yml +++ b/.github/workflows/oracle8.yml @@ -107,9 +107,9 @@ jobs: - name: Install gh if: ${{ env.IS_RELEASE == 'true' }} run: | - dnf install 'dnf-command(config-manager)' - dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo - dnf install gh + dnf -y install 'dnf-command(config-manager)' + dnf -y config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo + dnf -y install gh - name: Publish assets if: ${{ env.IS_RELEASE == 'true' }} From e812431df7b6fd5000a6b5a78bbaa1ebdcd350e2 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Wed, 10 Jan 2024 11:18:01 +0100 Subject: [PATCH 16/35] disable auto description --- .github/workflows/new_release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/new_release.yml b/.github/workflows/new_release.yml index 21997ad210..049aa4f0ec 100644 --- a/.github/workflows/new_release.yml +++ b/.github/workflows/new_release.yml @@ -25,8 +25,7 @@ jobs: run: | gh release create "$tag" \ --repo="$GITHUB_REPOSITORY" \ - --title="$title" \ - --generate-notes + --title="$title" From 534ca67e308b96dba26ba4b92f50687e5311a1be Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Wed, 10 Jan 2024 12:24:41 +0100 Subject: [PATCH 17/35] garbage collector --- .github/workflows/ubuntu.yml | 43 +++++++++++------------- .github/workflows/windows-vcpkg.yml | 51 +++++++++++++---------------- 2 files changed, 42 insertions(+), 52 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 9a866f3e1d..d4453fa35e 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -30,16 +30,11 @@ jobs: name: Build env: ORTOOLS_DIR: ${{ github.workspace }}/or-tools + os: ubuntu-20.04 - outputs: - os: ${{ matrix.os }} - - runs-on: ${{ matrix.os }} + runs-on: ${{ env.os }} if: "!contains(github.event.head_commit.message, '[skip ci]')" - strategy: - matrix: - os: [ubuntu-20.04] - test-platform: [ubuntu-20.04] + steps: - uses: actions/checkout@v3 @@ -47,7 +42,7 @@ jobs: - name: ccache uses: hendrikmuhs/ccache-action@v1.2 with: - key: ${{ matrix.os }} + key: ${{ env.os }} - name: Install libraries run: | @@ -72,7 +67,7 @@ jobs: uses: ./.github/workflows/download-extract-precompiled-libraries-tgz with: antares-deps-version: ${{steps.antares-deps-version.outputs.prop}} - os: ${{matrix.os}} + os: ${{env.os}} ortools-url: ${{env.ORTOOLS_URL}} ortools-dir: ${{env.ORTOOLS_DIR}} @@ -127,7 +122,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-named-mps - os: ${{ matrix.test-platform }} + os: ${{ env.os }} variant: "named-mps" - name: Run unfeasibility-related tests @@ -140,7 +135,7 @@ jobs: if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} run: | cd _build - ctest -C ${{ matrix.buildtype }} --output-on-failure -L "unit|end-to-end" + ctest -C Release --output-on-failure -L "unit|end-to-end" - name: Upload logs for failed tests if: ${{ failure() }} @@ -155,7 +150,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-v830 - os: ${{ matrix.test-platform }} + os: ${{ env.os }} - name: Run MILP with CBC if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -164,7 +159,7 @@ jobs: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-milp variant: "milp-cbc" - os: ${{ matrix.test-platform }} + os: ${{ env.os }} - name: Run tests introduced in v860 if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -172,7 +167,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-v860 - os: ${{ matrix.test-platform }} + os: ${{ env.os }} - name: Run tests introduced in v870 if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -180,7 +175,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-v870 - os: ${{ matrix.test-platform }} + os: ${{ env.os }} - name: Run short-tests if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -188,7 +183,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: short-tests - os: ${{ matrix.test-platform }} + os: ${{ env.os }} - name: Run mps tests if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -196,7 +191,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-mps - os: ${{ matrix.test-platform }} + os: ${{ env.os }} - name: Run tests for adequacy patch (CSR) if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -204,7 +199,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: adequacy-patch-CSR - os: ${{ matrix.test-platform }} + os: ${{ env.os }} - name: Run parallel tests if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -212,7 +207,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-parallel - os: ${{ matrix.test-platform }} + os: ${{ env.os }} variant: "parallel" - name: Run medium-tests @@ -221,7 +216,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: medium-tests - os: ${{ matrix.test-platform }} + os: ${{ env.os }} - name: Run long-tests-1 if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -229,7 +224,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: long-tests-1 - os: ${{ matrix.test-platform }} + os: ${{ env.os }} - name: Run long-tests-2 if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -237,7 +232,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: long-tests-2 - os: ${{ matrix.test-platform }} + os: ${{ env.os }} - name: Run long-tests-3 if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -245,7 +240,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: long-tests-3 - os: ${{ matrix.test-platform }} + os: ${{ env.os }} - name: Installer .deb creation run: | diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index dde2d616c2..8eef9e4a47 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -28,21 +28,16 @@ env: jobs: windows: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [windows-latest] - buildtype: [release] - include: - - os: windows-latest - triplet: x64-windows - vcpkgPackages: wxwidgets boost-test - test-platform: windows-2022 env: # Indicates the location of the vcpkg as a Git submodule of the project repository. VCPKG_ROOT: ${{ github.workspace }}/vcpkg ORTOOLS_DIR: ${{ github.workspace }}/or-tools RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule'}} + os: windows-latest + vcpkgPackages: wxwidgets boost-test + triplet: x64-windows + + runs-on: ${{ env.os }} steps: - uses: actions/checkout@v3 @@ -94,13 +89,13 @@ jobs: # The key includes: hash of the vcpkg.json file, the hash of the vcpkg Git commit id, and the used vcpkg's triplet. The vcpkg's commit id would suffice, but computing an hash out it does not harm. # Note: given a key, the cache content is immutable. If a cache entry has been created improperly, in order the recreate the right content the key must be changed as well, and it must be brand new (i.e. not existing already). key: | - ${{ hashFiles( 'vcpkg_manifest/vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ matrix.triplet }} + ${{ hashFiles( 'vcpkg_manifest/vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ env.triplet }} - name : Install deps with VCPKG run: | cd vcpkg ./bootstrap-vcpkg.sh - vcpkg install ${{matrix.vcpkgPackages}} --triplet ${{matrix.triplet}} + vcpkg install ${{env.vcpkgPackages}} --triplet ${{env.triplet}} rm -rf buildtrees packages downloads shell: bash @@ -115,7 +110,7 @@ jobs: uses: ./.github/workflows/download-extract-precompiled-libraries-zip with: antares-deps-version: ${{steps.antares-deps-version.outputs.prop}} - os: ${{matrix.os}} + os: ${{env.os}} ortools-url: ${{env.ORTOOLS_URL}} ortools-dir: ${{env.ORTOOLS_DIR}} @@ -144,7 +139,7 @@ jobs: -DDEPS_INSTALL_DIR=rte-antares-deps-Release \ -DCMAKE_PREFIX_PATH="${{ env.ORTOOLS_DIR }}/install" \ -DVCPKG_ROOT="${{env.VCPKG_ROOT}}" \ - -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} \ + -DVCPKG_TARGET_TRIPLET=${{ env.triplet }} \ -DCMAKE_BUILD_TYPE=release \ -DBUILD_TESTING=ON \ -DBUILD_TOOLS=ON \ @@ -170,7 +165,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-named-mps - os: ${{ matrix.test-platform }} + os: ${{ env.test-platform }} variant: "named-mps" - name: Run unfeasibility-related tests @@ -183,7 +178,7 @@ jobs: if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} run: | cd _build - ctest -C ${{ matrix.buildtype }} --output-on-failure -L "unit|end-to-end" -LE ortools + ctest -C Release --output-on-failure -L "unit|end-to-end" -LE ortools - name: Upload build on failure if: ${{ failure() }} @@ -199,7 +194,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: adequacy-patch-CSR - os: ${{ matrix.test-platform }} + os: ${{ env.test-platform }} - name: Run tests about infinity on BCs RHS if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -207,7 +202,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-v830 - os: ${{ matrix.test-platform }} + os: ${{ env.test-platform }} - name: Run MILP with CBC if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -216,7 +211,7 @@ jobs: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-milp variant: "milp-cbc" - os: ${{ matrix.test-platform }} + os: ${{ env.test-platform }} - name: Run tests introduced in v860 if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -224,7 +219,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-v860 - os: ${{ matrix.test-platform }} + os: ${{ env.test-platform }} - name: Run tests introduced in v870 if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -232,7 +227,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-v870 - os: ${{ matrix.test-platform }} + os: ${{ env.test-platform }} - name: Run short-tests if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -240,7 +235,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: short-tests - os: ${{ matrix.test-platform }} + os: ${{ env.test-platform }} - name: Run mps tests if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -248,7 +243,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-mps - os: ${{ matrix.test-platform }} + os: ${{ env.test-platform }} - name: Run parallel tests if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -256,7 +251,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-parallel - os: ${{ matrix.test-platform }} + os: ${{ env.test-platform }} variant: "parallel" - name: Run medium-tests @@ -265,7 +260,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: medium-tests - os: ${{ matrix.test-platform }} + os: ${{ env.test-platform }} - name: Run long-tests-1 if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -273,7 +268,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: long-tests-1 - os: ${{ matrix.test-platform }} + os: ${{ env.test-platform }} - name: Run long-tests-2 if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -281,7 +276,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: long-tests-2 - os: ${{ matrix.test-platform }} + os: ${{ env.test-platform }} - name: Run long-tests-3 if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -289,7 +284,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: long-tests-3 - os: ${{ matrix.test-platform }} + os: ${{ env.test-platform }} - name: Solver archive creation shell: bash From b6f223da5986c29b9fef9b1cf7af5389e11fb450 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Wed, 10 Jan 2024 12:27:04 +0100 Subject: [PATCH 18/35] update --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index d4453fa35e..b304197370 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -23,6 +23,7 @@ env: IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} RUN_SIMPLE_TESTS: ${{ github.event_name == 'push' || inputs.run-tests == 'true' }} RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule' || inputs.run-tests == 'true' }} + os: ubuntu-20.04 jobs: @@ -30,7 +31,6 @@ jobs: name: Build env: ORTOOLS_DIR: ${{ github.workspace }}/or-tools - os: ubuntu-20.04 runs-on: ${{ env.os }} if: "!contains(github.event.head_commit.message, '[skip ci]')" From 608b73bbd01892ac86374bb2e9dc0437ddf5479c Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Wed, 10 Jan 2024 12:34:06 +0100 Subject: [PATCH 19/35] :: --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index b304197370..277672ab4d 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -32,7 +32,7 @@ jobs: env: ORTOOLS_DIR: ${{ github.workspace }}/or-tools - runs-on: ${{ env.os }} + runs-on: $env.os if: "!contains(github.event.head_commit.message, '[skip ci]')" From f0bb3241154d83493143a6ab127e7facf5e4ebbd Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Wed, 10 Jan 2024 14:45:54 +0100 Subject: [PATCH 20/35] test --- .github/workflows/ubuntu.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 277672ab4d..8ef95e259b 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -23,7 +23,6 @@ env: IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} RUN_SIMPLE_TESTS: ${{ github.event_name == 'push' || inputs.run-tests == 'true' }} RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule' || inputs.run-tests == 'true' }} - os: ubuntu-20.04 jobs: @@ -31,18 +30,22 @@ jobs: name: Build env: ORTOOLS_DIR: ${{ github.workspace }}/or-tools + OS: ubuntu-20.04 - runs-on: $env.os + runs-on: ubuntu-20.04 if: "!contains(github.event.head_commit.message, '[skip ci]')" - steps: - - uses: actions/checkout@v3 + + #tmp + - name: print runner + run: echo "${{runner.name}}" + #end tmp- uses: actions/checkout@v3 - name: ccache uses: hendrikmuhs/ccache-action@v1.2 with: - key: ${{ env.os }} + key: ${{ runner.name }} - name: Install libraries run: | From 98b41fe58b6fcc17a0b9904aa2e00f24fc7ddacb Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Wed, 10 Jan 2024 14:57:46 +0100 Subject: [PATCH 21/35] fff --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 8ef95e259b..5c7513cf8c 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -39,7 +39,7 @@ jobs: #tmp - name: print runner - run: echo "${{runner.name}}" + run: echo "${{runner.os}}" #end tmp- uses: actions/checkout@v3 - name: ccache From f7d7a855f649fcde596b63270c88cab5e1bfdff6 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Wed, 10 Jan 2024 15:04:40 +0100 Subject: [PATCH 22/35] check env var --- .github/workflows/ubuntu.yml | 7 +------ .github/workflows/windows-vcpkg.yml | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 5c7513cf8c..206150cd49 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -37,11 +37,6 @@ jobs: steps: - #tmp - - name: print runner - run: echo "${{runner.os}}" - #end tmp- uses: actions/checkout@v3 - - name: ccache uses: hendrikmuhs/ccache-action@v1.2 with: @@ -53,7 +48,7 @@ jobs: sudo apt-get install uuid-dev libwxgtk3.0-gtk3-dev sudo apt-get install libboost-test-dev sudo apt-get install g++-10 gcc-10 - + - name: Read antares-deps version id: antares-deps-version uses: notiz-dev/github-action-json-property@release diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 8eef9e4a47..62d3d61ae2 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -37,7 +37,7 @@ jobs: vcpkgPackages: wxwidgets boost-test triplet: x64-windows - runs-on: ${{ env.os }} + runs-on: windows-latest steps: - uses: actions/checkout@v3 From 42a15b73795abe408581e25b9b497d51352acd09 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Wed, 10 Jan 2024 15:07:37 +0100 Subject: [PATCH 23/35] ... --- .github/workflows/ubuntu.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 206150cd49..3182338c0e 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -36,6 +36,7 @@ jobs: if: "!contains(github.event.head_commit.message, '[skip ci]')" steps: + - uses: actions/checkout@v3 - name: ccache uses: hendrikmuhs/ccache-action@v1.2 @@ -48,7 +49,7 @@ jobs: sudo apt-get install uuid-dev libwxgtk3.0-gtk3-dev sudo apt-get install libboost-test-dev sudo apt-get install g++-10 gcc-10 - + - name: Read antares-deps version id: antares-deps-version uses: notiz-dev/github-action-json-property@release From 772bbb9bae8a558daa92276733a53e4c4296d440 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Wed, 10 Jan 2024 15:11:24 +0100 Subject: [PATCH 24/35] * --- .github/workflows/windows-vcpkg.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 62d3d61ae2..40479f7b87 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -33,7 +33,7 @@ jobs: VCPKG_ROOT: ${{ github.workspace }}/vcpkg ORTOOLS_DIR: ${{ github.workspace }}/or-tools RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule'}} - os: windows-latest + OS: windows-latest vcpkgPackages: wxwidgets boost-test triplet: x64-windows @@ -110,7 +110,7 @@ jobs: uses: ./.github/workflows/download-extract-precompiled-libraries-zip with: antares-deps-version: ${{steps.antares-deps-version.outputs.prop}} - os: ${{env.os}} + os: ${{env.OS}} ortools-url: ${{env.ORTOOLS_URL}} ortools-dir: ${{env.ORTOOLS_DIR}} From d7bdcf510093e858259ecf82f1c8b1f16880acb8 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Wed, 10 Jan 2024 15:13:29 +0100 Subject: [PATCH 25/35] " --- .github/workflows/ubuntu.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 3182338c0e..763590cd8d 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -37,7 +37,7 @@ jobs: steps: - uses: actions/checkout@v3 - + - name: ccache uses: hendrikmuhs/ccache-action@v1.2 with: @@ -66,7 +66,7 @@ jobs: uses: ./.github/workflows/download-extract-precompiled-libraries-tgz with: antares-deps-version: ${{steps.antares-deps-version.outputs.prop}} - os: ${{env.os}} + os: ${{env.OS}} ortools-url: ${{env.ORTOOLS_URL}} ortools-dir: ${{env.ORTOOLS_DIR}} @@ -121,7 +121,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-named-mps - os: ${{ env.os }} + os: ${{ env.OS }} variant: "named-mps" - name: Run unfeasibility-related tests @@ -149,7 +149,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-v830 - os: ${{ env.os }} + os: ${{ env.OS }} - name: Run MILP with CBC if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -158,7 +158,7 @@ jobs: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-milp variant: "milp-cbc" - os: ${{ env.os }} + os: ${{ env.OS }} - name: Run tests introduced in v860 if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -166,7 +166,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-v860 - os: ${{ env.os }} + os: ${{ env.OS }} - name: Run tests introduced in v870 if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -174,7 +174,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-v870 - os: ${{ env.os }} + os: ${{ env.OS }} - name: Run short-tests if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -182,7 +182,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: short-tests - os: ${{ env.os }} + os: ${{ env.OS }} - name: Run mps tests if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -190,7 +190,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-mps - os: ${{ env.os }} + os: ${{ env.OS }} - name: Run tests for adequacy patch (CSR) if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -198,7 +198,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: adequacy-patch-CSR - os: ${{ env.os }} + os: ${{ env.OS }} - name: Run parallel tests if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -206,7 +206,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-parallel - os: ${{ env.os }} + os: ${{ env.OS }} variant: "parallel" - name: Run medium-tests @@ -215,7 +215,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: medium-tests - os: ${{ env.os }} + os: ${{ env.OS }} - name: Run long-tests-1 if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -223,7 +223,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: long-tests-1 - os: ${{ env.os }} + os: ${{ env.OS }} - name: Run long-tests-2 if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -231,7 +231,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: long-tests-2 - os: ${{ env.os }} + os: ${{ env.OS }} - name: Run long-tests-3 if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -239,7 +239,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: long-tests-3 - os: ${{ env.os }} + os: ${{ env.OS }} - name: Installer .deb creation run: | From c1e8225f297e0cb69946d0dd26f0eef0be6b3caf Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Wed, 10 Jan 2024 16:57:04 +0100 Subject: [PATCH 26/35] include UG --- .github/workflows/build-userguide.yml | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-userguide.yml b/.github/workflows/build-userguide.yml index c8752df8f3..f7bb41e601 100644 --- a/.github/workflows/build-userguide.yml +++ b/.github/workflows/build-userguide.yml @@ -7,19 +7,21 @@ on: branches: - release/* - doc/* + workflow_call: + inputs: + run-tests: + required: true + type: boolean env: - IS_RELEASE: ${{ github.event_name == 'release' && github.event.action == 'created' }} + IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }} jobs: build: - runs-on: ${{ matrix.os }} + runs-on: ubuntu-20.04 if: "!contains(github.event.head_commit.message, '[skip ci]')" - strategy: - matrix: - os: [ubuntu-20.04] steps: - uses: actions/checkout@v3 @@ -27,7 +29,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: 3.12 - name: Install dependencies run: | @@ -55,10 +57,12 @@ jobs: name: pdf-reference-guide path: ${{ env.PDF_PATH }} - - name: Upload user guide as release asset + + - name: Publish assets if: ${{ env.IS_RELEASE == 'true' }} - uses: alexellis/upload-assets@0.4.0 env: - GITHUB_TOKEN: ${{ github.token }} - with: - asset_paths: ${{ env.PDF_PATH_ASSET }} + GITHUB_TOKEN: ${{ github.token }} + tag: ${{ github.event.inputs.release_tag }} + run: | + gh release upload "$tag" ${{ env.PDF_PATH_ASSET }} + From 3414708e1f7dae298b6d6871f0fa759cdf03bd71 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Wed, 10 Jan 2024 17:00:43 +0100 Subject: [PATCH 27/35] missing file --- .github/workflows/new_release.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/new_release.yml b/.github/workflows/new_release.yml index 049aa4f0ec..04a0aa05ec 100644 --- a/.github/workflows/new_release.yml +++ b/.github/workflows/new_release.yml @@ -56,3 +56,10 @@ jobs: uses: ./.github/workflows/oracle8.yml with: run-tests: ${{ fromJSON(inputs.run-tests) }} + + user_guide: + name: User Guide + needs: release + uses: ./.github/workflows/build-userguide.yml + with: + run-tests: ${{ fromJSON(inputs.run-tests) }} From 3bcc2f88e99949c9a81f51f78ebcf5082f9939fa Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Wed, 10 Jan 2024 17:31:30 +0100 Subject: [PATCH 28/35] win --- .github/workflows/windows-vcpkg.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 40479f7b87..17d82f4fbc 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -33,7 +33,7 @@ jobs: VCPKG_ROOT: ${{ github.workspace }}/vcpkg ORTOOLS_DIR: ${{ github.workspace }}/or-tools RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule'}} - OS: windows-latest + OS: windows-2022 vcpkgPackages: wxwidgets boost-test triplet: x64-windows @@ -165,7 +165,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-named-mps - os: ${{ env.test-platform }} + os: ${{ env.OS }} variant: "named-mps" - name: Run unfeasibility-related tests @@ -194,7 +194,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: adequacy-patch-CSR - os: ${{ env.test-platform }} + os: ${{ env.OS }} - name: Run tests about infinity on BCs RHS if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -202,7 +202,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-v830 - os: ${{ env.test-platform }} + os: ${{ env.OS }} - name: Run MILP with CBC if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -211,7 +211,7 @@ jobs: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-milp variant: "milp-cbc" - os: ${{ env.test-platform }} + os: ${{ env.OS }} - name: Run tests introduced in v860 if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -219,7 +219,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-v860 - os: ${{ env.test-platform }} + os: ${{ env.OS }} - name: Run tests introduced in v870 if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -227,7 +227,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-v870 - os: ${{ env.test-platform }} + os: ${{ env.OS }} - name: Run short-tests if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -235,7 +235,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: short-tests - os: ${{ env.test-platform }} + os: ${{ env.OS }} - name: Run mps tests if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -243,7 +243,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-mps - os: ${{ env.test-platform }} + os: ${{ env.OS }} - name: Run parallel tests if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -251,7 +251,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-parallel - os: ${{ env.test-platform }} + os: ${{ env.OS }} variant: "parallel" - name: Run medium-tests @@ -260,7 +260,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: medium-tests - os: ${{ env.test-platform }} + os: ${{ env.OS }} - name: Run long-tests-1 if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -268,7 +268,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: long-tests-1 - os: ${{ env.test-platform }} + os: ${{ env.OS }} - name: Run long-tests-2 if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -276,7 +276,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: long-tests-2 - os: ${{ env.test-platform }} + os: ${{ env.OS }} - name: Run long-tests-3 if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -284,7 +284,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: long-tests-3 - os: ${{ env.test-platform }} + os: ${{ env.OS }} - name: Solver archive creation shell: bash From d0bc27f4c4e2a2d87f4241e112318d6c456b5fbb Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Wed, 10 Jan 2024 17:47:48 +0100 Subject: [PATCH 29/35] Revert "win" This reverts commit 3bcc2f88e99949c9a81f51f78ebcf5082f9939fa. --- .github/workflows/windows-vcpkg.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 17d82f4fbc..40479f7b87 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -33,7 +33,7 @@ jobs: VCPKG_ROOT: ${{ github.workspace }}/vcpkg ORTOOLS_DIR: ${{ github.workspace }}/or-tools RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule'}} - OS: windows-2022 + OS: windows-latest vcpkgPackages: wxwidgets boost-test triplet: x64-windows @@ -165,7 +165,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-named-mps - os: ${{ env.OS }} + os: ${{ env.test-platform }} variant: "named-mps" - name: Run unfeasibility-related tests @@ -194,7 +194,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: adequacy-patch-CSR - os: ${{ env.OS }} + os: ${{ env.test-platform }} - name: Run tests about infinity on BCs RHS if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -202,7 +202,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-v830 - os: ${{ env.OS }} + os: ${{ env.test-platform }} - name: Run MILP with CBC if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -211,7 +211,7 @@ jobs: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-milp variant: "milp-cbc" - os: ${{ env.OS }} + os: ${{ env.test-platform }} - name: Run tests introduced in v860 if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -219,7 +219,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-v860 - os: ${{ env.OS }} + os: ${{ env.test-platform }} - name: Run tests introduced in v870 if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -227,7 +227,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-v870 - os: ${{ env.OS }} + os: ${{ env.test-platform }} - name: Run short-tests if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -235,7 +235,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: short-tests - os: ${{ env.OS }} + os: ${{ env.test-platform }} - name: Run mps tests if: ${{ env.RUN_SIMPLE_TESTS == 'true' }} @@ -243,7 +243,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-mps - os: ${{ env.OS }} + os: ${{ env.test-platform }} - name: Run parallel tests if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -251,7 +251,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: valid-parallel - os: ${{ env.OS }} + os: ${{ env.test-platform }} variant: "parallel" - name: Run medium-tests @@ -260,7 +260,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: medium-tests - os: ${{ env.OS }} + os: ${{ env.test-platform }} - name: Run long-tests-1 if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -268,7 +268,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: long-tests-1 - os: ${{ env.OS }} + os: ${{ env.test-platform }} - name: Run long-tests-2 if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -276,7 +276,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: long-tests-2 - os: ${{ env.OS }} + os: ${{ env.test-platform }} - name: Run long-tests-3 if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} @@ -284,7 +284,7 @@ jobs: with: simtest-tag: ${{steps.simtest-version.outputs.prop}} batch-name: long-tests-3 - os: ${{ env.OS }} + os: ${{ env.test-platform }} - name: Solver archive creation shell: bash From a711fa641932fb6f8d89cce8079336292427e0da Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Wed, 10 Jan 2024 17:49:52 +0100 Subject: [PATCH 30/35] fix --- .github/workflows/windows-vcpkg.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index 40479f7b87..b6c0d2ae8e 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -34,6 +34,7 @@ jobs: ORTOOLS_DIR: ${{ github.workspace }}/or-tools RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule'}} OS: windows-latest + test-platform: windows-2022 vcpkgPackages: wxwidgets boost-test triplet: x64-windows From 289de31128ba32574499e173b127a23281abaede Mon Sep 17 00:00:00 2001 From: abdoulbari zakir <32519851+a-zakir@users.noreply.github.com> Date: Thu, 11 Jan 2024 10:37:32 +0100 Subject: [PATCH 31/35] Update .github/workflows/build-userguide.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Florian Omnès <26088210+flomnes@users.noreply.github.com> --- .github/workflows/build-userguide.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-userguide.yml b/.github/workflows/build-userguide.yml index f7bb41e601..fdd474a9c2 100644 --- a/.github/workflows/build-userguide.yml +++ b/.github/workflows/build-userguide.yml @@ -64,5 +64,5 @@ jobs: GITHUB_TOKEN: ${{ github.token }} tag: ${{ github.event.inputs.release_tag }} run: | - gh release upload "$tag" ${{ env.PDF_PATH_ASSET }} + gh release upload "$tag" ${{ env.PDF_PATH }} From c11f5f6e2ee47825f587064085d5d77a445b2df2 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Thu, 11 Jan 2024 10:40:38 +0100 Subject: [PATCH 32/35] rename job --- .github/workflows/windows-vcpkg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index b6c0d2ae8e..03f82d4fcc 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -26,7 +26,7 @@ env: jobs: - windows: + build: env: # Indicates the location of the vcpkg as a Git submodule of the project repository. From 9a06fe9ebe2d3d48d43f6997381bf2eef832d952 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Thu, 11 Jan 2024 10:47:15 +0100 Subject: [PATCH 33/35] pr suggestion --- .github/workflows/new_release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/new_release.yml b/.github/workflows/new_release.yml index 04a0aa05ec..f12b873eae 100644 --- a/.github/workflows/new_release.yml +++ b/.github/workflows/new_release.yml @@ -26,6 +26,7 @@ jobs: gh release create "$tag" \ --repo="$GITHUB_REPOSITORY" \ --title="$title" + --notes="Run tests: $tests" From 8a6ce6d99f18f06eb6ad8874545fe7751ce60ecb Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Thu, 11 Jan 2024 10:50:24 +0100 Subject: [PATCH 34/35] fix --- .github/workflows/new_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/new_release.yml b/.github/workflows/new_release.yml index f12b873eae..2568eec858 100644 --- a/.github/workflows/new_release.yml +++ b/.github/workflows/new_release.yml @@ -25,7 +25,7 @@ jobs: run: | gh release create "$tag" \ --repo="$GITHUB_REPOSITORY" \ - --title="$title" + --title="$title" \ --notes="Run tests: $tests" From bbee7808df9831d6f75432c4c4dfed5871bc4e37 Mon Sep 17 00:00:00 2001 From: Abdoulbari ZAKIR Date: Thu, 11 Jan 2024 10:53:42 +0100 Subject: [PATCH 35/35] fix --- .github/workflows/new_release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/new_release.yml b/.github/workflows/new_release.yml index 2568eec858..bdb156a776 100644 --- a/.github/workflows/new_release.yml +++ b/.github/workflows/new_release.yml @@ -22,6 +22,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} tag: ${{ github.event.inputs.release_tag }} title: ${{ github.event.inputs.release_name }} + tests: ${{ github.event.inputs.run-tests }} run: | gh release create "$tag" \ --repo="$GITHUB_REPOSITORY" \