Skip to content
This repository has been archived by the owner on Oct 15, 2024. It is now read-only.

CI: update macOS images and various fixes #3639

Merged
merged 22 commits into from
Apr 6, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
13 changes: 3 additions & 10 deletions .github/workflows/macOS_gcc10.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ env:
BUILD_TYPE: RelWithDebInfo
# Unfortunately the tests for the Xerces plugin fail: https://travis-ci.org/ElektraInitiative/libelektra/jobs/483331657#L3740
# The curlget tests fail: https://github.com/ElektraInitiative/libelektra/issues/3382
PLUGINS: 'ALL;-xerces;-curlget'
# The tests fail with jni: https://github.com/ElektraInitiative/libelektra/issues/3747
PLUGINS: 'ALL;-xerces;-curlget;-jni'
markus2330 marked this conversation as resolved.
Show resolved Hide resolved
BINDINGS: 'ALL;-rust'
# Skip homebrew cleanup to avoid issues with removal of packages
HOMEBREW_NO_INSTALL_CLEANUP: 1
Expand Down Expand Up @@ -57,9 +58,9 @@ jobs:

- name: Setup Build Environment
run: |
sudo ln -sfn /usr/local/opt/openjdk/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk.jdk
echo "JAVA_HOME=/Library/Java/JavaVirtualMachines/openjdk.jdk/Contents/Home" >> $GITHUB_ENV
echo "/usr/local/opt/openjdk/bin" >> $GITHUB_PATH
sudo ln -sfn /usr/local/opt/openjdk/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk.jdk
gem install test-unit --no-document
pip2 install cheetah # Required by kdb-gen
brew tap homebrew/services
Expand All @@ -77,10 +78,6 @@ jobs:
# and build directories, but this is only available with CMake 3.13 and higher.
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
run: |
which java
which javac
java --version
javac --version
SYSTEM_DIR="$PWD/kdbsystem"
CMAKE_OPT+=(
-GNinja
Expand Down Expand Up @@ -119,9 +116,5 @@ jobs:
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: |
which java
which javac
java --version
javac --version
cmake --build . --target run_all
kdb run_all
2 changes: 1 addition & 1 deletion doc/news/_preparation_next_release.md
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ _(@tucek)_

### GitHub Actions

- Fix issues with `dbus` and java paths. _(Mihael Pranjić)_
- Fix issues with `dbus` and java paths, exclude `jni`. _(Mihael Pranjić)_
- <<TODO>>
- <<TODO>>

Expand Down