Skip to content

Commit

Permalink
Merge pull request #25 from InsightSoftwareConsortium/revert-long-name
Browse files Browse the repository at this point in the history
Revert "BUG: Resolve cxx Windows path length issue"
  • Loading branch information
tbirdso authored Dec 8, 2022
2 parents 87ee97f + 95103c4 commit b114bdd
Showing 1 changed file with 7 additions and 23 deletions.
30 changes: 7 additions & 23 deletions .github/workflows/build-test-cxx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,7 @@ jobs:
cmake-build-type: "MinSizeRel"

steps:
- uses: actions/checkout@v3
with:
path: 'im'

- name: 'Reduce source path length'
shell: bash
run: |
# Move checked-out source to a shorter path to avoid Windows path length issues
mv im ../../
- uses: actions/checkout@v2

- name: Set up Python 3.8
uses: actions/setup-python@v2
Expand All @@ -63,44 +55,39 @@ jobs:
uses: lukka/[email protected]

- name: Download ITK
shell: bash
run: |
cd ../../
cd ..
git clone https://github.com/InsightSoftwareConsortium/ITK.git
cd ITK
git checkout ${{ inputs.itk-git-tag }}
- name: Build ITK
if: matrix.os != 'windows-2022'
shell: bash
run: |
cd ../../
cd ..
mkdir ITK-build
cd ITK-build
cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF ${{ inputs.itk-cmake-options }} -GNinja ../ITK
ninja
- name: Build ITK
if: matrix.os == 'windows-2022'
shell: cmd
run: |
cd ../../
cd ..
mkdir ITK-build
cd ITK-build
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
cmake -DCMAKE_C_COMPILER:FILEPATH="${{ matrix.c-compiler }}" -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER="${{ matrix.cxx-compiler }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.cmake-build-type }} -DBUILD_TESTING:BOOL=OFF ${{ inputs.itk-cmake-options }} -GNinja ../ITK
ninja
shell: cmd

- name: Fetch CTest driver script
shell: bash
run: |
cd ../../im
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITK/dashboard/itk_common.cmake -O
- name: Configure CTest script
shell: bash
run: |
cd ../../im
operating_system="${{ matrix.os }}"
cat > dashboard.cmake << EOF
set(CTEST_SITE "GitHubActions")
Expand Down Expand Up @@ -145,15 +132,12 @@ jobs:
- name: Build and test
if: matrix.os != 'windows-2022'
shell: bash
run: |
cd ../../im
run: |
ctest --output-on-failure -j 2 -V -S dashboard.cmake ${{ inputs.ctest-options }}
- name: Build and test
if: matrix.os == 'windows-2022'
shell: cmd
run: |
cd ../../im
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
ctest --output-on-failure -j 2 -V -S dashboard.cmake ${{ inputs.ctest-options }}
shell: cmd

0 comments on commit b114bdd

Please sign in to comment.