diff --git a/.github/workflows/analysis_workflow.yml b/.github/workflows/analysis_workflow.yml index 978ca2aa7..ee35bb1e1 100644 --- a/.github/workflows/analysis_workflow.yml +++ b/.github/workflows/analysis_workflow.yml @@ -75,7 +75,7 @@ jobs: run: | ctest -T Test \ -C Release \ - --timeout 7200 \ + --timeout 14400 \ --output-on-failure \ -VV working-directory: _build diff --git a/.github/workflows/ci_steps.yml b/.github/workflows/ci_steps.yml index 72b37db73..b6df91ae3 100644 --- a/.github/workflows/ci_steps.yml +++ b/.github/workflows/ci_steps.yml @@ -156,13 +156,12 @@ jobs: name: install_manifest path: _build/${{ env.INSTALL_MANIFEST }} - # Remove for now to avoid the install issues with OpenJPH - # - name: Validate install - # if: ${{ inputs.validate_install == 'ON'}} - # # Validate that the build has installed the proper files by comparing against the appropriate reference manifest - # run: | - # share/ci/scripts/validate_install.py "_build/$INSTALL_MANIFEST" "share/ci/install_manifest/$INSTALL_MANIFEST" - # shell: bash + - name: Validate install + if: ${{ inputs.validate_install == 'ON'}} + # Validate that the build has installed the proper files by comparing against the appropriate reference manifest + run: | + share/ci/scripts/validate_install.py "_build/$INSTALL_MANIFEST" "share/ci/install_manifest/$INSTALL_MANIFEST" + shell: bash - name: Set PATH for Imath/libdeflate DLLs # When building against external Imath/libdeflate shared objects, the tests need PATH to include the dll's. @@ -173,6 +172,6 @@ jobs: - name: Test run: | - ctest -T Test -C ${{ inputs.build-type }} --timeout 7200 --output-on-failure -VV + ctest -T Test -C ${{ inputs.build-type }} --timeout 14400 --output-on-failure -VV working-directory: _build shell: bash diff --git a/.github/workflows/ci_workflow_old.yml b/.github/workflows/ci_workflow_old.yml index 854bdbfd6..748e8c5ed 100644 --- a/.github/workflows/ci_workflow_old.yml +++ b/.github/workflows/ci_workflow_old.yml @@ -96,7 +96,7 @@ jobs: run: | ctest -T Test \ -C Release \ - --timeout 7200 \ + --timeout 14400 \ --output-on-failure \ -VV working-directory: _build