Skip to content

Run CI on MacOS #72

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Sep 22, 2022
Merged

Run CI on MacOS #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4ef6037
Run CI on MacOS
ascopes Sep 22, 2022
300e280
Merge branch 'main' into task/macos
ascopes Sep 22, 2022
f3db26e
Make prepare-test-outputs-for-merge compatible with MacOS
ascopes Sep 22, 2022
9daae98
Don't trap untrappable SIGKILL
ascopes Sep 22, 2022
caa1f12
Make Sonatype Lift happy
ascopes Sep 22, 2022
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
6 changes: 4 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,16 @@ jobs:
os:
- windows-latest
- ubuntu-latest
# TODO: get working on MacOS
#- macos-latest
# Sanity check, should be the same as Ubuntu (POSIX file system)
- macos-latest
java-version: [ 11, 12, 13, 14, 15, 16, 17, 18, 19 ]
include:
- os: windows-latest
build-script: './mvnw.cmd'
- os: ubuntu-latest
build-script: './mvnw'
- os: macos-latest
build-script: './mvnw'

steps:
- name: Checkout repository
Expand Down
7 changes: 4 additions & 3 deletions scripts/prepare-test-outputs-for-merge.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ if ! command -v xsltproc >/dev/null 2>&1; then
fi

echo -e "\e[1;35mUpdating Surefire reports...\e[0m"
surefire_prefix_xslt=$(mktemp --suffix=.xslt)
surefire_prefix_xslt_dir="$(mktemp -d)"
trap 'rm -Rf "${surefire_prefix_xslt_dir}"' EXIT SIGINT SIGTERM SIGQUIT
surefire_prefix_xslt="${surefire_prefix_xslt_dir}/surefire.xslt"

sed 's/^ //g' >"${surefire_prefix_xslt}" <<'EOF'
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
Expand Down Expand Up @@ -87,8 +90,6 @@ for surefire_report in $(find-all-surefire-reports); do
rm "${surefire_report}"
done

rm "${surefire_prefix_xslt}"

echo -e "\e[1;35mUpdating Jacoco reports...\e[0m"
for jacoco_report in $(find-all-jacoco-reports); do
new_jacoco_report="${jacoco_report/.xml/-java-${ci_java_version}-${ci_os}.xml}"
Expand Down