Skip to content

Commit

Permalink
Improve CI
Browse files Browse the repository at this point in the history
  • Loading branch information
magnesj authored Jan 4, 2024
1 parent 0334ef8 commit a5eaee6
Showing 1 changed file with 11 additions and 16 deletions.
27 changes: 11 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,36 @@ name: Build Qwt

on: [push, pull_request]
jobs:
ResInsight-x64:
build-qwt:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest]
qtver: [5.12.12, 6.5.3]
include:
- qtver: 6.5.3
build_flags: -DUSE_QT6=TRUE
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Install Linux dependencies
if: contains(matrix.os, 'ubuntu')
run: sudo apt-get install libxkbcommon-x11-0 libgl1-mesa-dev mesa-common-dev libglfw3-dev libglu1-mesa-dev

- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
version: ${{ matrix.qtver }}
dir: "${{ github.workspace }}/Qt/"
cache: true
cache-key-prefix: ${{ matrix.qtver }}-${{ matrix.os }}

- name: Install Linux dependencies
if: "contains( matrix.os, 'ubuntu')"
run: sudo apt-get install libxkbcommon-x11-0 libgl1-mesa-dev mesa-common-dev libglfw3-dev libglu1-mesa-dev

- name: Use MSVC (Windows)
uses: ilammy/msvc-dev-cmd@v1

- name: Configure 5.12
if: "contains( matrix.qtver, '5.12')"
run: |
cmake -S . -B build
- name: Configure 6.5
if: "contains( matrix.qtver, '6.5')"
- name: Configure and build
run: |
cmake -S . -DUSE_QT6=TRUE -B build
- name: Build
run: cmake --build build
cmake -S . ${{matrix.build_flags}} -B build
cmake --build build

0 comments on commit a5eaee6

Please sign in to comment.