Skip to content

Commit

Permalink
Add macOS and Windows builds to GHA CI build matrix
Browse files Browse the repository at this point in the history
Signed-off-by: Wouter Born <[email protected]>
  • Loading branch information
wborn committed Aug 30, 2023
1 parent 3ddbdb2 commit 5b1295b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 55 deletions.
51 changes: 0 additions & 51 deletions .github/scripts/maven-build

This file was deleted.

15 changes: 11 additions & 4 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- 'main'
- 'multi-os'
paths-ignore:
- '.github/**/*.md'
pull_request:
Expand All @@ -20,10 +21,16 @@ jobs:
matrix:
java: [ '17' ]
maven: [ '3.9.4' ]
os: [ 'ubuntu-22.04' ]
os: [ 'macos-12', 'ubuntu-22.04', 'windows-2022' ]
name: Build (Java ${{ matrix.java }}, ${{ matrix.os }})
runs-on: ${{ matrix.os }}
steps:
- name: Set up line endings
if: ${{ matrix.os == 'windows-2022' }}
run: |
git config --global core.autocrlf false
git config --global core.eol crlf
- name: Checkout
if: github.head_ref == ''
uses: actions/checkout@v3
Expand Down Expand Up @@ -56,14 +63,14 @@ jobs:
maven-version: ${{ matrix.maven }}

- name: Register Problem Matchers
if: ${{ matrix.java == '17' }}
if: ${{ matrix.java == '17' && matrix.os == 'ubuntu-22.04' }}
id: problem_matchers
run: |
echo "::add-matcher::.github/openhab-compile-problems.json"
- name: Build
id: build
run: './.github/scripts/maven-build'
run: mvn clean verify -B -T 1.5C -U
env:
MAVEN_OPTS: >-
-Xmx2g
Expand All @@ -86,7 +93,7 @@ jobs:
path: target/summary_report.html

- name: Report SAT Errors as Annotations
if: ${{ matrix.java == '17' && always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
if: ${{ matrix.java == '17' && matrix.os == 'ubuntu-22.04' && always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
uses: ghys/checkstyle-github-action@main
with:
title: CheckStyle Violations
Expand Down

0 comments on commit 5b1295b

Please sign in to comment.