Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI fixes #161

Merged
merged 17 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/build_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,15 @@ jobs:
steps:

- name: git clone
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Remove links before installing python3, else get brew install errors sometimes
run: |
rm '/usr/local/bin/2to3'
rm '/usr/local/bin/2to3-3.11'
rm '/usr/local/bin/2to3-3.12'
rm '/usr/local/bin/idle3.12'
rm '/usr/local/bin/pydoc3.12'

- name: Install dependencies
run: |
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/build_ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:
steps:

- name: git clone
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install libvtk7-dev ocl-icd-opencl-dev libgtk-3-dev libwxgtk3.0-gtk3-dev libpocl2 pocl-opencl-icd
sudo apt-get install libvtk7-dev ocl-icd-opencl-dev libgtk-3-dev libwxgtk3.0-gtk3-dev libpocl2

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build
Expand All @@ -47,7 +47,8 @@ jobs:
working-directory: ${{runner.workspace}}/build
run: cmake --build . --config ${{matrix.build_type}}

- name: Test
- name: Test (without OpenCL)
shell: bash
working-directory: ${{runner.workspace}}/build
run: ctest -C ${{matrix.build_type}} --rerun-failed --output-on-failure
# run: ctest -C ${{matrix.build_type}} --output-on-failure # OpenCL tests (disabled for now)
run: ctest -R rdy -C ${{matrix.build_type}} --output-on-failure
22 changes: 11 additions & 11 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-2022, windows-2019]
os: [windows-2022]
build_type: [Debug, Release]
runs-on: ${{ matrix.os }}

steps:

- name: git clone
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Prepare Visual Studio command prompt
uses: ilammy/msvc-dev-cmd@v1
Expand All @@ -32,30 +32,30 @@ jobs:

- name: Cache wxWidgets (Release)
if: matrix.build_type == 'Release'
id: cache-wxwidgets-release
id: cache-wxwidgets-3-2-4-release
uses: actions/cache@v4
with:
path: wxWidgets-${{env.WXVERSION}}
key: ${{runner.os}}-build-wxWidgets-release
key: ${{runner.os}}-build-wxWidgets-3-2-4-release

- name: Cache wxWidgets (Debug)
if: matrix.build_type == 'Debug'
id: cache-wxwidgets-debug
uses: actions/cache@v2
id: cache-wxwidgets-3-2-4-debug
uses: actions/cache@v4
with:
path: wxWidgets-${{env.WXVERSION}}
key: ${{runner.os}}-build-wxWidgets-debug
key: ${{runner.os}}-build-wxWidgets-3.2.4-debug

- name: Compile wxWidgets (Release)
if: matrix.build_type == 'Release' && steps.cache-wxwidgets-release.outputs.cache-hit != 'true'
if: matrix.build_type == 'Release' && steps.cache-wxwidgets-3-2-4-release.outputs.cache-hit != 'true'
run: |
Invoke-WebRequest -Uri https://github.com/wxWidgets/wxWidgets/releases/download/v${{env.WXVERSION}}/wxWidgets-${{env.WXVERSION}}.zip -OutFile wxWidgets-${{env.WXVERSION}}.zip
Expand-Archive -LiteralPath wxWidgets-${{env.WXVERSION}}.zip -DestinationPath wxWidgets-${{env.WXVERSION}}
cd wxWidgets-${{env.WXVERSION}}/build/msw
nmake -C -f makefile.vc BUILD=release RUNTIME_LIBS=static UNICODE=1 DEBUG_INFO=0 DEBUG_FLAG=0

- name: Compile wxWidgets (Debug)
if: matrix.build_type == 'Debug' && steps.cache-wxwidgets-debug.outputs.cache-hit != 'true'
if: matrix.build_type == 'Debug' && steps.cache-wxwidgets-3-2-4-debug.outputs.cache-hit != 'true'
run: |
Invoke-WebRequest -Uri https://github.com/wxWidgets/wxWidgets/releases/download/v${{env.WXVERSION}}/wxWidgets-${{env.WXVERSION}}.zip -OutFile wxWidgets-${{env.WXVERSION}}.zip
Expand-Archive -LiteralPath wxWidgets-${{env.WXVERSION}}.zip -DestinationPath wxWidgets-${{env.WXVERSION}}
Expand All @@ -64,7 +64,7 @@ jobs:

- name: Cache OpenCL
id: cache-opencl
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-opencl
with:
Expand All @@ -78,7 +78,7 @@ jobs:

- name: Cache VTK
id: cache-vtk
uses: actions/cache@v2
uses: actions/cache@v4
env:
cache-name: cache-vtk
with:
Expand Down