diff --git a/.github/workflows/build-userguide.yml b/.github/workflows/build-userguide.yml index 1122c8399e..c8752df8f3 100644 --- a/.github/workflows/build-userguide.yml +++ b/.github/workflows/build-userguide.yml @@ -1,11 +1,15 @@ name: Build Userguide pdf on: - workflow_call: - inputs: - artifact_name: - required: true - type: string + release: + types: [created] + push: + branches: + - release/* + - doc/* + +env: + IS_RELEASE: ${{ github.event_name == 'release' && github.event.action == 'created' }} jobs: @@ -35,13 +39,26 @@ jobs: sudo apt-get update --fix-missing sudo apt-get install latexmk texlive-latex-recommended texlive-formats-extra - - id: create-user-guide - name: user guide pdf creation - uses: ./.github/workflows/generate-userguide-pdf + + - name: Generate PDF for user-guide + shell: bash + run: | + PDF_NAME=antares-general-reference-guide.pdf + cd docs/pdf-doc-generation-with-sphinx + bash create_pdf_doc.sh $PDF_NAME + echo "PDF_PATH=docs/pdf-doc-generation-with-sphinx/$PDF_NAME" >> $GITHUB_ENV + echo "PDF_PATH_ASSET= [\"docs/pdf-doc-generation-with-sphinx/$PDF_NAME\"]" >> $GITHUB_ENV - name: user guide upload uses: actions/upload-artifact@v3 with: - name: ${{ inputs.artifact_name }} - path: ${{ steps.create-user-guide.outputs.pdf-path }} + name: pdf-reference-guide + path: ${{ env.PDF_PATH }} + - name: Upload user guide as release asset + if: ${{ env.IS_RELEASE == 'true' }} + uses: alexellis/upload-assets@0.4.0 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + asset_paths: ${{ env.PDF_PATH_ASSET }} diff --git a/.github/workflows/centos7-system-deps-build.yml b/.github/workflows/centos7-system-deps-build.yml index 9d69ca22ed..710c89ba09 100644 --- a/.github/workflows/centos7-system-deps-build.yml +++ b/.github/workflows/centos7-system-deps-build.yml @@ -1,10 +1,8 @@ name: Centos7 CI (deps. compilation) on: - push: - branches: - - release/* - - develop + schedule: + - cron: '21 2 * * 1' jobs: @@ -24,10 +22,16 @@ jobs: run: | yum install -y epel-release yum install -y git redhat-lsb-core gcc gcc-c++ make wget centos-release-scl scl-utils rpm-build - yum install -y cmake3 devtoolset-9 + yum install -y devtoolset-9 yum install -y rh-git227-git yum install -y unzip libuuid-devel wxGTK3-devel boost-test boost-devel + - name: Install cmake + run: | + wget https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-linux-x86_64.tar.gz + tar xvf cmake-3.25.3-linux-x86_64.tar.gz -C / + echo "/cmake-3.25.3-linux-x86_64/bin" >> $GITHUB_PATH + rm cmake-3.25.3-linux-x86_64.tar.gz - name: Checkout run: | @@ -35,7 +39,7 @@ jobs: - name: Init submodule run: | - git submodule update --init --recursive src . + git submodule update --init --recursive src/antares-deps - name: Install dependencies run: | @@ -46,23 +50,23 @@ jobs: source /opt/rh/devtoolset-9/enable #git 2.x must be enabled for Coin compilation with CMake ExternalProject_Add source /opt/rh/rh-git227/enable - cmake3 -B _build -S src -DCMAKE_BUILD_TYPE=release -DBUILD_TESTING=ON + cmake -B _build -S src -DCMAKE_BUILD_TYPE=release -DBUILD_TESTING=ON - name: Build run: | source /opt/rh/devtoolset-9/enable source /opt/rh/rh-git227/enable - cmake3 --build _build --config release -j2 + cmake --build _build --config release -j2 - name: Installer .rpm creation run: | cd _build - cpack3 -G RPM + cpack -G RPM - name: Installer .tar.gz creation run: | cd _build - cpack3 -G TGZ + cpack -G TGZ - name: Installer archive upload uses: actions/upload-artifact@v3 diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 3332200cbc..aa043a8bb8 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -6,12 +6,8 @@ on: push: branches: - develop - - feature/* - - features/* - - fix/* - - issue-* - - release/* - - doc/* + schedule: + - cron: '21 2 * * *' env: GITHUB_TOKEN: ${{ github.token }} @@ -20,19 +16,12 @@ env: jobs: - doc_generation: - uses: ./.github/workflows/build-userguide.yml - with: - artifact_name: pdf-doc - build: name: Build env: ORTOOLSDIR: ${{ github.workspace }}/or-tools runs-on: ubuntu-latest - needs: - - doc_generation container: 'antaresrte/rte-antares:centos7-simulator-no-deps' steps: @@ -43,7 +32,7 @@ jobs: - name: Init submodule run: | - git submodule update --init --recursive src/antares-deps src/tests/resources/Antares_Simulator_Tests + git submodule update --init --remote src/antares-deps src/tests/resources/Antares_Simulator_Tests - name: Download & extract precompiled deps at root run: | @@ -65,12 +54,6 @@ jobs: unzip -q ortools.zip rm ortools.zip - - name: Download userguide - uses: actions/download-artifact@v3 - with: - name: pdf-doc - path: docs/ref_guides - - name: Configure run: | source /opt/rh/devtoolset-9/enable @@ -81,6 +64,8 @@ jobs: -DCMAKE_BUILD_TYPE=release \ -DBUILD_TESTING=ON \ -DBUILD_not_system=OFF \ + -DBUILD_TOOLS=OFF \ + -DBUILD_UI=OFF \ -DCMAKE_PREFIX_PATH=${{ env.ORTOOLSDIR }}/install \ - name: Build @@ -98,7 +83,12 @@ jobs: - name: Solver archive creation run: | cd _build - tar czf antares-solver_centos7.tar.gz solver/antares-*-solver solver/libsirius_solver.so + cmake3 --install . --prefix install + pushd . + cd install/bin + tar czf ../../antares-solver_centos7.tar.gz antares-*-solver libsirius_solver.so + popd + rm -rf install - name: .tar.gz creation run: | diff --git a/.github/workflows/oracle8.yml b/.github/workflows/oracle8.yml new file mode 100644 index 0000000000..efbff48a81 --- /dev/null +++ b/.github/workflows/oracle8.yml @@ -0,0 +1,119 @@ +name: Oracle 8 CI (push and/or release) + +on: + release: + types: [created] + push: + branches: + - develop + schedule: + - cron: '21 2 * * *' + +env: + GITHUB_TOKEN: ${{ github.token }} + IS_RELEASE: ${{ github.event_name == 'release' && github.event.action == 'created' }} + IS_PUSH: ${{ github.event_name == 'push' }} + +jobs: + + build: + name: Build + env: + ORTOOLSDIR: ${{ github.workspace }}/or-tools + + runs-on: ubuntu-latest + container: 'oraclelinux:8' + + steps: + + - name: Set up Python + run: | + dnf update -y + dnf install -y python3 python3-pip + + - name: Install libraries + run: | + 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-9-toolchain + + - name: Checkout + run: | + git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git -b $GITHUB_REF_NAME . + + - name: Init submodule + run: | + git config --global safe.directory '*' + git submodule update --init --remote src/antares-deps src/tests/resources/Antares_Simulator_Tests + + - name: Install dependencies + run: | + pip3 install -r src/tests/examples/requirements.txt + + - name: Configure + run: | + source /opt/rh/gcc-toolset-9/enable + cmake -B _build -S src \ + -DCMAKE_BUILD_TYPE=release \ + -DBUILD_TESTING=ON \ + -DBUILD_TOOLS=OFF \ + -DBUILD_UI=OFF \ + + - name: Build + run: | + source /opt/rh/gcc-toolset-9/enable + cmake --build _build --config Release -j2 + + - name: Run unit and end-to-end tests + if: ${{ env.IS_PUSH == 'true' }} + run: | + cd _build + ctest -C Release --output-on-failure -L "unit|end-to-end" + + - name: Installer .rpm creation + run: | + cd _build + cpack -G RPM + + - name: Solver archive creation + run: | + cd _build + cmake --install . --prefix install + pushd . + cd install/bin + tar czf ../../antares-solver_oracle8.tar.gz antares-*-solver libsirius_solver.so + popd + rm -rf install + + - name: .tar.gz creation + run: | + cd _build + cpack -G TGZ + + - name: Installer TGZ push + uses: actions/upload-artifact@v3 + with: + path: _build/*.tar.gz + + - name: Installer RPM push + 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' }} + uses: alexellis/upload-assets@0.4.0 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + asset_paths: '["*/*.tar.gz", "*/*.rpm"]' diff --git a/.github/workflows/run-tests/action.yml b/.github/workflows/run-tests/action.yml index 55a96f7d70..a4d4bd3a44 100644 --- a/.github/workflows/run-tests/action.yml +++ b/.github/workflows/run-tests/action.yml @@ -10,7 +10,10 @@ inputs: os: description: 'OS used for github action' required: true - + variant: + description: 'launch specific test' + required: false + default: "json" runs: using: "composite" steps: @@ -27,7 +30,7 @@ runs: shell: bash {0} run: | cd _build - ctest -C Release --output-on-failure -R json + ctest -C Release --output-on-failure -R ${{inputs.variant}} echo "RET_CODE=$?" >> $GITHUB_ENV - name: Clean batches diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index afe915dba0..b2336e9969 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -18,8 +18,6 @@ jobs: os: [ubuntu-20.04] env: - SONAR_SCANNER_VERSION: 4.7.0.2747 # Find the latest version in the "Linux" link on this page: - # https://sonarcloud.io/documentation/analysis/scan/sonarscanner/ SONAR_SERVER_URL: "https://sonarcloud.io" ORTOOLS_DIR: ${{ github.workspace }}/or-tools ORTOOLS_URL: "https://github.com/rte-france/or-tools/releases/download/v9.2-rte1.7/ortools_cxx_ubuntu-20.04_static_sirius.zip" @@ -27,46 +25,16 @@ jobs: steps: - uses: actions/checkout@v3 with: - fetch-depth: 0 + fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis + + - name: Install sonar-scanner and build-wrapper + uses: SonarSource/sonarcloud-github-c-cpp@v2 - name: ccache uses: hendrikmuhs/ccache-action@v1.2 with: key: sonarcloud-${{ env.SONAR_SCANNER_VERSION }} - - name: Cache SonarCloud packages and analysis - uses: actions/cache@v3 - id: sonarcloud-cache - with: - path: ~/.sonar - key: ${{ runner.os }}-sonar-${{ env.SONAR_SCANNER_VERSION }} - restore-keys: ${{ runner.os }}-sonar-${{ env.SONAR_SCANNER_VERSION }} - - - name: Download and setup sonar-scanner - shell: bash - env: - SONAR_SCANNER_DOWNLOAD_URL: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${{ env.SONAR_SCANNER_VERSION }}-linux.zip - if: steps.sonarcloud-cache.outputs.cache-hit != 'true' - run: | - mkdir -p $HOME/.sonar - curl -sSLo $HOME/.sonar/sonar-scanner.zip ${{ env.SONAR_SCANNER_DOWNLOAD_URL }} - unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/ - - - name: Download and setup build-wrapper - shell: bash - env: - BUILD_WRAPPER_DOWNLOAD_URL: ${{ env.SONAR_SERVER_URL }}/static/cpp/build-wrapper-linux-x86.zip - if: steps.sonarcloud-cache.outputs.cache-hit != 'true' - run: | - curl -sSLo $HOME/.sonar/build-wrapper-linux-x86.zip ${{ env.BUILD_WRAPPER_DOWNLOAD_URL }} - unzip -o $HOME/.sonar/build-wrapper-linux-x86.zip -d $HOME/.sonar/ - - - name: Set build-wrapper and sonar-scanner paths - run: | - echo "$HOME/.sonar/build-wrapper-linux-x86" >> $GITHUB_PATH - echo "$HOME/.sonar/sonar-scanner-${{ env.SONAR_SCANNER_VERSION }}-linux/bin" >> $GITHUB_PATH - - - name: Install libraries run: | sudo apt-get update @@ -104,7 +72,8 @@ jobs: - name: Init submodule run: | - git submodule update --init --recursive src + git submodule update --init src/antares-deps + git submodule update --init --remote src/tests/resources/Antares_Simulator_Tests - name: Configure run: | diff --git a/.github/workflows/ubuntu-system-deps-build.yml b/.github/workflows/ubuntu-system-deps-build.yml index a5cee04842..34fcc2d91a 100644 --- a/.github/workflows/ubuntu-system-deps-build.yml +++ b/.github/workflows/ubuntu-system-deps-build.yml @@ -1,10 +1,9 @@ name: Ubuntu CI (deps. compilation) on: - push: - branches: - - release/* - - develop + schedule: + - cron: '21 2 * * 1' + jobs: linux: diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 4d9379f2ca..07f4ceb3a5 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -12,19 +12,17 @@ on: - issue-* - release/* - doc/* + schedule: + - cron: '21 2 * * *' env: GITHUB_TOKEN: ${{ github.token }} IS_RELEASE: ${{ github.event_name == 'release' && github.event.action == 'created' }} IS_PUSH: ${{ github.event_name == 'push' }} + RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule' || github.event_name == 'release' }} jobs: - doc_generation: - uses: ./.github/workflows/build-userguide.yml - with: - artifact_name: pdf-doc - build: name: Build env: @@ -34,7 +32,6 @@ jobs: os: ${{ matrix.os }} runs-on: ${{ matrix.os }} - needs: doc_generation if: "!contains(github.event.head_commit.message, '[skip ci]')" strategy: matrix: @@ -88,7 +85,7 @@ jobs: - name: Init submodule run: | git submodule update --init src/antares-deps - git submodule update --init src/tests/resources/Antares_Simulator_Tests + git submodule update --init --remote --recursive src/tests/resources/Antares_Simulator_Tests - name: Configure push run: | @@ -99,12 +96,22 @@ jobs: -DCMAKE_BUILD_TYPE=release \ -DBUILD_TESTING=ON \ -DBUILD_not_system=OFF \ + -DBUILD_TOOLS=ON \ -DCMAKE_PREFIX_PATH=${{ env.ORTOOLS_DIR }}/install \ - name: Build 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 unfeasibility-related tests if: ${{ env.IS_PUSH == 'true' }} run: | @@ -118,17 +125,13 @@ jobs: ctest -C ${{ matrix.buildtype }} --output-on-failure -L "unit|end-to-end" - name: Run kirchhoff constraints tests + if: ${{ false }} shell: bash run: | tar xvf src/tests/kirchhoff-cbuilder/reference.tar.gz -C src/tests/kirchhoff-cbuilder/ cd _build ctest -C Release --output-on-failure -R kirchhoff - - name: Run MPS comparison test - run: | - cd _build - ctest -C Release --output-on-failure -R mps - - name: Upload logs for failed tests if: ${{ failure() }} uses: actions/upload-artifact@v3 @@ -136,14 +139,6 @@ jobs: name: test-log path: ${{ github.workspace }}/_build/Testing/Temporary/LastTest.log - # 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 tests about infinity on BCs RHS if: ${{ env.IS_PUSH == 'true' }} uses: ./.github/workflows/run-tests @@ -161,7 +156,7 @@ jobs: os: ${{ matrix.test-platform }} - name: Run medium-tests - if: ${{ env.IS_RELEASE == 'true' }} + if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} @@ -169,7 +164,7 @@ jobs: os: ${{ matrix.test-platform }} - name: Run long-tests-1 - if: ${{ env.IS_RELEASE == 'true' }} + if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} @@ -177,7 +172,7 @@ jobs: os: ${{ matrix.test-platform }} - name: Run long-tests-2 - if: ${{ env.IS_RELEASE == 'true' }} + if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} @@ -185,7 +180,7 @@ jobs: os: ${{ matrix.test-platform }} - name: Run long-tests-3 - if: ${{ env.IS_RELEASE == 'true' }} + if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} uses: ./.github/workflows/run-tests with: simtest-tag: ${{steps.simtest-version.outputs.prop}} @@ -205,7 +200,12 @@ jobs: - name: Solver archive creation run: | cd _build - tar czf antares-solver_ubuntu20.04.tar.gz solver/antares-*-solver solver/libsirius_solver.so + cmake --install . --prefix install + pushd . + cd install/bin + tar czf ../../antares-solver_ubuntu20.04.tar.gz antares-*-solver libsirius_solver.so + popd + rm -rf install - name: Installer archive upload push uses: actions/upload-artifact@v3 diff --git a/.github/workflows/windows-release.yml b/.github/workflows/windows-release.yml index 6d9e6ca29a..08a7f5ab42 100644 --- a/.github/workflows/windows-release.yml +++ b/.github/workflows/windows-release.yml @@ -4,19 +4,10 @@ on: release: types: [created] -env: - GITHUB_TOKEN: ${{ github.token }} - jobs: - doc_generation: - uses: ./.github/workflows/build-userguide.yml - with: - artifact_name: pdf-doc - windows: runs-on: ${{ matrix.os }} - needs: doc_generation strategy: matrix: os: [windows-latest] @@ -34,11 +25,6 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Get release - id: get_release - uses: bruceadams/get-release@v1.3.2 - - - name: Pre-requisites shell: cmd run: | @@ -59,7 +45,7 @@ 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 }}-invalidate + ${{ hashFiles( 'vcpkg_manifest/vcpkg.json' ) }}-${{ hashFiles( '.git/modules/vcpkg/HEAD' )}}-${{ matrix.triplet }} - name: Setup Python 3.11 uses: actions/setup-python@v4 @@ -76,12 +62,6 @@ jobs: rm -rf buildtrees packages downloads shell: bash - - name: Download userguide - uses: actions/download-artifact@v3 - with: - name: pdf-doc - path: docs/ref_guides - - name: Read antares-deps version id: antares-deps-version uses: notiz-dev/github-action-json-property@release @@ -118,6 +98,7 @@ jobs: -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} \ -DCMAKE_BUILD_TYPE=release \ -DBUILD_TESTING=ON \ + -DBUILD_TOOLS=ON \ -DBUILD_not_system=OFF - name: Build @@ -149,6 +130,13 @@ jobs: path: 'simtest.json' prop_path: 'version' + - name: Run tests for adequacy patch (CSR) + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: adequacy-patch-CSR + os: ${{ matrix.test-platform }} + - name: Run medium-tests uses: ./.github/workflows/run-tests with: @@ -195,7 +183,6 @@ jobs: shell: bash run: | rm -rf src/tests/resources/Antares_Simulator_Tests - rm -rf src/tests/resources/NonRegTests cd _build cpack -GNSIS export NSIS_NAME=$(ls *.exe) diff --git a/.github/workflows/windows-vcpkg.yml b/.github/workflows/windows-vcpkg.yml index c47c3cc4af..146e49eb9c 100644 --- a/.github/workflows/windows-vcpkg.yml +++ b/.github/workflows/windows-vcpkg.yml @@ -10,17 +10,13 @@ on: - issue-* - release/* - doc/* + schedule: + - cron: '21 2 * * *' jobs: - doc_generation: - uses: ./.github/workflows/build-userguide.yml - with: - artifact_name: pdf-doc - windows: runs-on: ${{ matrix.os }} - needs: doc_generation strategy: matrix: os: [windows-latest] @@ -35,6 +31,7 @@ jobs: VCPKG_ROOT: ${{ github.workspace }}/vcpkg ORTOOLS_DIR: ${{ github.workspace }}/or-tools ORTOOLS_URL: "https://github.com/rte-france/or-tools/releases/download/v9.2-rte2.1/ortools_cxx_windows-latest_static_sirius.zip" + RUN_EXTENDED_TESTS: ${{ github.event_name == 'schedule'}} steps: - uses: actions/checkout@v3 @@ -48,12 +45,6 @@ jobs: run: | git submodule update --init vcpkg - - name: Download userguide - uses: actions/download-artifact@v3 - with: - name: pdf-doc - path: docs/ref_guides - # Restore both vcpkg and its artifacts from the GitHub cache service. - name: Restore vcpkg and its artifacts. uses: actions/cache@v3 @@ -120,6 +111,7 @@ jobs: -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} \ -DCMAKE_BUILD_TYPE=release \ -DBUILD_TESTING=ON \ + -DBUILD_TOOLS=ON \ -DBUILD_not_system=OFF - name: Build @@ -138,6 +130,7 @@ jobs: ctest -C ${{ matrix.buildtype }} --output-on-failure -L "unit|end-to-end" -LE ortools - name: Run kirchhoff-constraint-tests + if: ${{ false }} shell: bash run: | tar xvf src/tests/kirchhoff-cbuilder/reference.tar.gz -C src/tests/kirchhoff-cbuilder/ @@ -179,6 +172,39 @@ jobs: batch-name: short-tests os: ${{ matrix.test-platform }} + + - name: Run medium-tests + if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: medium-tests + os: ${{ matrix.test-platform }} + + - name: Run long-tests-1 + if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: long-tests-1 + os: ${{ matrix.test-platform }} + + - name: Run long-tests-2 + if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: long-tests-2 + os: ${{ matrix.test-platform }} + + - name: Run long-tests-3 + if: ${{ env.RUN_EXTENDED_TESTS == 'true' }} + uses: ./.github/workflows/run-tests + with: + simtest-tag: ${{steps.simtest-version.outputs.prop}} + batch-name: long-tests-3 + os: ${{ matrix.test-platform }} + - name: Solver archive creation shell: bash run: | @@ -189,12 +215,18 @@ jobs: shell: bash run: | rm -rf src/tests/resources/Antares_Simulator_Tests - rm -rf src/tests/resources/NonRegTests cd _build cpack -GNSIS export NSIS_NAME=$(ls *.exe) echo "NSIS_NAME=$NSIS_NAME" >> $GITHUB_ENV + - name: Upload NSIS log on failure + if: ${{ failure() }} + uses: actions/upload-artifact@v3 + with: + name: NSISError.log + path: _build/_CPack_Packages/win64/NSIS/NSISOutput.log + - name: .zip creation run: | cd _build @@ -209,10 +241,3 @@ jobs: uses: actions/upload-artifact@v3 with: path: _build/*.zip - - - name: Upload build on failure - if: ${{ failure() }} - uses: actions/upload-artifact@v3 - with: - name: build-after-failure - path: ${{ github.workspace }}/_build