From 93bcf77be4db2e82062dc75194763802c283f534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Fri, 29 Jan 2021 15:16:33 +0100 Subject: [PATCH 01/22] cirrus: restart dbus service before running tests, fixes #3635 --- .cirrus.yml | 2 +- doc/news/_preparation_next_release.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 4a6d1308daf..24d00935af7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -165,7 +165,7 @@ mac_task: - | # Start D-Bus session bus brew tap homebrew/services brew update # Work around for [Homebrew Services issue 206](https://github.com/Homebrew/homebrew-services/issues/206) - brew services start dbus + brew services restart dbus - | # Install Python brew install python@3.8 || brew upgrade python@3.8 export PATH="/usr/local/opt/python@3.8/bin:$PATH" diff --git a/doc/news/_preparation_next_release.md b/doc/news/_preparation_next_release.md index c2851c16ffb..4ace002770c 100644 --- a/doc/news/_preparation_next_release.md +++ b/doc/news/_preparation_next_release.md @@ -249,6 +249,10 @@ _(@tucek)_ - Update FreeBSD images from version 12.1 to 12.2 _(Robert Sowula)_ - <> +- Upgrade Cirrus Fedora docker image to Fedora 33. _(Mihael Pranjić)_ +- Upgrade to Ruby 3.0 for macOS builds. _(Mihael Pranjić)_ +- Update brew before installing packages and print brew config. _(Mihael Pranjić)_ +- Restart `dbus` service before running tests. _(Mihael Pranjić)_ - <> ### GitHub Actions @@ -256,6 +260,8 @@ _(@tucek)_ - <> - <> - <> +- We added a build job that translates Elektra with GCC on macOS. _(Mihael Pranjić, René Schwaiger)_ +- Update brew before installing packages and print brew config. _(Mihael Pranjić)_ ### Jenkins From fa018c3e345d4d900453a2206134ce7c642ffedb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Sun, 31 Jan 2021 11:34:25 +0100 Subject: [PATCH 02/22] cirrus: upgrade macOS images and test dbus session --- .cirrus.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 24d00935af7..68e497f5839 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -86,7 +86,7 @@ mac_task: - name: 🍎 Clang osx_instance: - image: catalina-xcode + image: big-sur-xcode env: ENABLE_LOGGER: ON TOOLS: ALL;web @@ -94,7 +94,7 @@ mac_task: - name: 🍎 Clang ASAN osx_instance: - image: catalina-xcode + image: big-sur-xcode env: ASAN_OPTIONS: 'detect_leaks=1' BINDINGS: cpp @@ -105,7 +105,7 @@ mac_task: - name: 🍎 FULL osx_instance: - image: catalina-xcode + image: big-sur-xcode env: BUILD_FULL: ON BUILD_SHARED: OFF @@ -113,7 +113,7 @@ mac_task: - name: 🍎 MMap osx_instance: - image: catalina-xcode + image: big-sur-xcode env: KDB_DEFAULT_STORAGE: mmapstorage KDB_DB_FILE: default.mmap @@ -132,6 +132,7 @@ mac_task: brew install boost brew install clang-format brew install dbus + brew upgrade dbus brew install discount brew install doxygen brew install flex @@ -166,6 +167,8 @@ mac_task: brew tap homebrew/services brew update # Work around for [Homebrew Services issue 206](https://github.com/Homebrew/homebrew-services/issues/206) brew services restart dbus + launchctl getenv DBUS_LAUNCHD_SESSION_BUS_SOCKET + ls -l /private/tmp/com.apple.launchd* - | # Install Python brew install python@3.8 || brew upgrade python@3.8 export PATH="/usr/local/opt/python@3.8/bin:$PATH" From 9905f19a63ee8eee958fb9db6e4e244b808beb22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Fri, 26 Mar 2021 00:25:03 +0100 Subject: [PATCH 03/22] tests: include dbus tests again --- .cirrus.yml | 3 +-- scripts/dev/run_nocheckshell.in | 7 +------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 68e497f5839..79a6ca805e8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -100,8 +100,7 @@ mac_task: BINDINGS: cpp ENABLE_ASAN: ON TOOLS: kdb - PLUGINS: ALL;-curlget # The curlget tests fail: https://github.com/ElektraInitiative/libelektra/issues/3382 - DBUS_BUG: ON # dbus tests on cirrus are failing: https://github.com/ElektraInitiative/libelektra/issues/3635 + PLUGINS: ALL;-curlget;-dbus # The curlget tests fail: https://github.com/ElektraInitiative/libelektra/issues/3382 - name: 🍎 FULL osx_instance: diff --git a/scripts/dev/run_nocheckshell.in b/scripts/dev/run_nocheckshell.in index 08d1850de6a..0801c57c481 100755 --- a/scripts/dev/run_nocheckshell.in +++ b/scripts/dev/run_nocheckshell.in @@ -10,10 +10,5 @@ if [ $# -ne 1 ]; then exit 1 fi -if [ "$DBUS_BUG" = 'ON' ]; then - ARGS="-j@PROCESSOR_COUNT@ --force-new-ctest-process --output-on-failure -E test(scr_check|mod_dbus) --build-config $1" -else - ARGS="-j@PROCESSOR_COUNT@ --force-new-ctest-process --output-on-failure -E testscr_check --build-config $1" -fi - +ARGS="-j@PROCESSOR_COUNT@ --force-new-ctest-process --output-on-failure -E testscr_check --build-config $1" ctest $ARGS || ctest $ARGS --rerun-failed From ddf9f19f625dab86dfe3c854a11ad555ac5ceeed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Fri, 26 Mar 2021 00:28:20 +0100 Subject: [PATCH 04/22] doc: cleanup --- .cirrus.yml | 2 +- doc/news/_preparation_next_release.md | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 79a6ca805e8..706caa37b5a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -100,7 +100,7 @@ mac_task: BINDINGS: cpp ENABLE_ASAN: ON TOOLS: kdb - PLUGINS: ALL;-curlget;-dbus # The curlget tests fail: https://github.com/ElektraInitiative/libelektra/issues/3382 + PLUGINS: ALL;-curlget # The curlget tests fail: https://github.com/ElektraInitiative/libelektra/issues/3382 - name: 🍎 FULL osx_instance: diff --git a/doc/news/_preparation_next_release.md b/doc/news/_preparation_next_release.md index 4ace002770c..6e2405793d1 100644 --- a/doc/news/_preparation_next_release.md +++ b/doc/news/_preparation_next_release.md @@ -249,8 +249,6 @@ _(@tucek)_ - Update FreeBSD images from version 12.1 to 12.2 _(Robert Sowula)_ - <> -- Upgrade Cirrus Fedora docker image to Fedora 33. _(Mihael Pranjić)_ -- Upgrade to Ruby 3.0 for macOS builds. _(Mihael Pranjić)_ - Update brew before installing packages and print brew config. _(Mihael Pranjić)_ - Restart `dbus` service before running tests. _(Mihael Pranjić)_ - <> @@ -260,8 +258,6 @@ _(@tucek)_ - <> - <> - <> -- We added a build job that translates Elektra with GCC on macOS. _(Mihael Pranjić, René Schwaiger)_ -- Update brew before installing packages and print brew config. _(Mihael Pranjić)_ ### Jenkins From a4c7dc37efe2b811adc96ee4e330aa04025fe233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Fri, 26 Mar 2021 11:48:49 +0100 Subject: [PATCH 05/22] cirrus: set DBUS_LAUNCHD_SESSION_BUS_SOCKET manually as workaround --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index 706caa37b5a..483f8e9a2d8 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -168,6 +168,7 @@ mac_task: brew services restart dbus launchctl getenv DBUS_LAUNCHD_SESSION_BUS_SOCKET ls -l /private/tmp/com.apple.launchd* + export DBUS_LAUNCHD_SESSION_BUS_SOCKET=$(find /private/tmp/com.apple.launchd*/unix_domain_listener | xargs ls -Art | tail -n1) # workaround for cirrus - | # Install Python brew install python@3.8 || brew upgrade python@3.8 export PATH="/usr/local/opt/python@3.8/bin:$PATH" From 936e9406eabc39596a90a0a4983aa56fa1ef2fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Fri, 26 Mar 2021 15:41:57 +0100 Subject: [PATCH 06/22] cirrus: print env --- .cirrus.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 483f8e9a2d8..e210885e27f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -169,6 +169,9 @@ mac_task: launchctl getenv DBUS_LAUNCHD_SESSION_BUS_SOCKET ls -l /private/tmp/com.apple.launchd* export DBUS_LAUNCHD_SESSION_BUS_SOCKET=$(find /private/tmp/com.apple.launchd*/unix_domain_listener | xargs ls -Art | tail -n1) # workaround for cirrus + echo $DBUS_LAUNCHD_SESSION_BUS_SOCKET + ls -l $DBUS_LAUNCHD_SESSION_BUS_SOCKET + launchctl getenv DBUS_LAUNCHD_SESSION_BUS_SOCKET - | # Install Python brew install python@3.8 || brew upgrade python@3.8 export PATH="/usr/local/opt/python@3.8/bin:$PATH" From 3c7e8d13d772682d9c033ca889a4764d4beb09f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Wed, 31 Mar 2021 13:49:57 +0200 Subject: [PATCH 07/22] cirrus, workflows: re-run postinstall for dbus --- .cirrus.yml | 1 + .github/workflows/macOS_gcc10.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index e210885e27f..3e1f47d8d42 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -165,6 +165,7 @@ mac_task: - | # Start D-Bus session bus brew tap homebrew/services brew update # Work around for [Homebrew Services issue 206](https://github.com/Homebrew/homebrew-services/issues/206) + brew postinstall dbus brew services restart dbus launchctl getenv DBUS_LAUNCHD_SESSION_BUS_SOCKET ls -l /private/tmp/com.apple.launchd* diff --git a/.github/workflows/macOS_gcc10.yml b/.github/workflows/macOS_gcc10.yml index b36b7f0d584..fb38746f4bd 100644 --- a/.github/workflows/macOS_gcc10.yml +++ b/.github/workflows/macOS_gcc10.yml @@ -53,6 +53,7 @@ jobs: pip2 install cheetah # Required by kdb-gen brew tap homebrew/services brew update # Work around for [Homebrew Services issue 206](https://github.com/Homebrew/homebrew-services/issues/206) + brew postinstall dbus brew services restart dbus cmake -E make_directory ${{runner.workspace}}/build From 4feb9d2f9558cec8e644a03340ba6943436b7b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Wed, 31 Mar 2021 15:19:08 +0200 Subject: [PATCH 08/22] actions: set JAVA_HOME --- .github/workflows/macOS_gcc10.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macOS_gcc10.yml b/.github/workflows/macOS_gcc10.yml index fb38746f4bd..edbb6588390 100644 --- a/.github/workflows/macOS_gcc10.yml +++ b/.github/workflows/macOS_gcc10.yml @@ -21,7 +21,7 @@ jobs: # well on Windows or Mac. You can convert this to a matrix build if you need # cross-platform coverage. # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix - runs-on: macos-latest + runs-on: macos-10.15 steps: - uses: actions/checkout@v2 @@ -68,6 +68,7 @@ jobs: run: | PATH="/usr/local/opt/ruby@2.7/bin:/usr/local/lib/ruby/gems/2.7.0/bin:$PATH" PATH="/usr/local/opt/python@3.9/bin:$PATH" + JAVA_HOME=$JAVA_HOME_11_X64 SYSTEM_DIR="$PWD/kdbsystem" CMAKE_OPT+=( -GNinja From 87bcb5a47d1becab05336378e8186e27dc66358f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Wed, 31 Mar 2021 15:20:16 +0200 Subject: [PATCH 09/22] cirrus: launchd set dbus session socket --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index 3e1f47d8d42..7d6a921bffe 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -170,6 +170,7 @@ mac_task: launchctl getenv DBUS_LAUNCHD_SESSION_BUS_SOCKET ls -l /private/tmp/com.apple.launchd* export DBUS_LAUNCHD_SESSION_BUS_SOCKET=$(find /private/tmp/com.apple.launchd*/unix_domain_listener | xargs ls -Art | tail -n1) # workaround for cirrus + launchctl setenv DBUS_LAUNCHD_SESSION_BUS_SOCKET $DBUS_LAUNCHD_SESSION_BUS_SOCKET echo $DBUS_LAUNCHD_SESSION_BUS_SOCKET ls -l $DBUS_LAUNCHD_SESSION_BUS_SOCKET launchctl getenv DBUS_LAUNCHD_SESSION_BUS_SOCKET From bf34a99c63044034cd6ced4257c2258f0224a548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Fri, 2 Apr 2021 12:27:59 +0200 Subject: [PATCH 10/22] actions: use openjdk --- .github/workflows/macOS_gcc10.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macOS_gcc10.yml b/.github/workflows/macOS_gcc10.yml index edbb6588390..d111baf92ac 100644 --- a/.github/workflows/macOS_gcc10.yml +++ b/.github/workflows/macOS_gcc10.yml @@ -42,6 +42,7 @@ jobs: brew install libuv brew install lua brew install ninja + brew install openjdk brew install qt brew install swig brew install yajl @@ -68,7 +69,10 @@ jobs: run: | PATH="/usr/local/opt/ruby@2.7/bin:/usr/local/lib/ruby/gems/2.7.0/bin:$PATH" PATH="/usr/local/opt/python@3.9/bin:$PATH" - JAVA_HOME=$JAVA_HOME_11_X64 + JAVA_HOME="$(/usr/libexec/java_home -v 15)" + echo $JAVA_HOME + which java + java --version SYSTEM_DIR="$PWD/kdbsystem" CMAKE_OPT+=( -GNinja From b48342ee448508c1598e144d9dce1702bbf53184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Fri, 2 Apr 2021 15:28:01 +0200 Subject: [PATCH 11/22] cirrus: disable augeas test on macOS, refs #3743 --- .cirrus.yml | 12 +++++++++--- .github/workflows/macOS_gcc10.yml | 3 +-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 7d6a921bffe..09a2d1d3b94 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -90,7 +90,9 @@ mac_task: env: ENABLE_LOGGER: ON TOOLS: ALL;web - PLUGINS: ALL;-curlget # The curlget tests fail: https://github.com/ElektraInitiative/libelektra/issues/3382 + PLUGINS: ALL;-curlget;-augeas + # The curlget tests fail: https://github.com/ElektraInitiative/libelektra/issues/3382 + # The augeas tests fail: https://github.com/ElektraInitiative/libelektra/issues/3743 - name: 🍎 Clang ASAN osx_instance: @@ -100,7 +102,9 @@ mac_task: BINDINGS: cpp ENABLE_ASAN: ON TOOLS: kdb - PLUGINS: ALL;-curlget # The curlget tests fail: https://github.com/ElektraInitiative/libelektra/issues/3382 + PLUGINS: ALL;-curlget;-augeas + # The curlget tests fail: https://github.com/ElektraInitiative/libelektra/issues/3382 + # The augeas tests fail: https://github.com/ElektraInitiative/libelektra/issues/3743 - name: 🍎 FULL osx_instance: @@ -117,7 +121,9 @@ mac_task: KDB_DEFAULT_STORAGE: mmapstorage KDB_DB_FILE: default.mmap KDB_DB_INIT: elektra.mmap - PLUGINS: ALL;-curlget # The curlget tests fail: https://github.com/ElektraInitiative/libelektra/issues/3382 + PLUGINS: ALL;-curlget;-augeas + # The curlget tests fail: https://github.com/ElektraInitiative/libelektra/issues/3382 + # The augeas tests fail: https://github.com/ElektraInitiative/libelektra/issues/3743 install_script: - | # Install Homebrew formulas diff --git a/.github/workflows/macOS_gcc10.yml b/.github/workflows/macOS_gcc10.yml index d111baf92ac..18b990e5100 100644 --- a/.github/workflows/macOS_gcc10.yml +++ b/.github/workflows/macOS_gcc10.yml @@ -42,7 +42,6 @@ jobs: brew install libuv brew install lua brew install ninja - brew install openjdk brew install qt brew install swig brew install yajl @@ -69,7 +68,7 @@ jobs: run: | PATH="/usr/local/opt/ruby@2.7/bin:/usr/local/lib/ruby/gems/2.7.0/bin:$PATH" PATH="/usr/local/opt/python@3.9/bin:$PATH" - JAVA_HOME="$(/usr/libexec/java_home -v 15)" + JAVA_HOME="$(/usr/libexec/java_home -v 14)" echo $JAVA_HOME which java java --version From b4cb27642673208d43d7f9d783311e3e1fa10a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Fri, 2 Apr 2021 15:34:56 +0200 Subject: [PATCH 12/22] news: update release notes & cleanup --- .cirrus.yml | 5 +---- doc/news/_preparation_next_release.md | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 09a2d1d3b94..30cd08fbb93 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -172,13 +172,10 @@ mac_task: brew tap homebrew/services brew update # Work around for [Homebrew Services issue 206](https://github.com/Homebrew/homebrew-services/issues/206) brew postinstall dbus - brew services restart dbus - launchctl getenv DBUS_LAUNCHD_SESSION_BUS_SOCKET - ls -l /private/tmp/com.apple.launchd* + brew services restart dbus # Workaround for dbus socket issues on cirrus export DBUS_LAUNCHD_SESSION_BUS_SOCKET=$(find /private/tmp/com.apple.launchd*/unix_domain_listener | xargs ls -Art | tail -n1) # workaround for cirrus launchctl setenv DBUS_LAUNCHD_SESSION_BUS_SOCKET $DBUS_LAUNCHD_SESSION_BUS_SOCKET echo $DBUS_LAUNCHD_SESSION_BUS_SOCKET - ls -l $DBUS_LAUNCHD_SESSION_BUS_SOCKET launchctl getenv DBUS_LAUNCHD_SESSION_BUS_SOCKET - | # Install Python brew install python@3.8 || brew upgrade python@3.8 diff --git a/doc/news/_preparation_next_release.md b/doc/news/_preparation_next_release.md index 6e2405793d1..0b106ee6def 100644 --- a/doc/news/_preparation_next_release.md +++ b/doc/news/_preparation_next_release.md @@ -250,12 +250,13 @@ _(@tucek)_ - Update FreeBSD images from version 12.1 to 12.2 _(Robert Sowula)_ - <> - Update brew before installing packages and print brew config. _(Mihael Pranjić)_ -- Restart `dbus` service before running tests. _(Mihael Pranjić)_ +- Restart `dbus` service before running tests and find `DBUS_LAUNCHD_SESSION_BUS_SOCKET` manually (as workaround). _(Mihael Pranjić)_ +- Use macOS Big Sur images. _(Mihael Pranjić)_ - <> ### GitHub Actions -- <> +- Fix issues with `dbus` and java paths. _(Mihael Pranjić)_ - <> - <> From efed6ac6c71ba787df3ee6b19d5c0ef9bef0c784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Fri, 2 Apr 2021 18:21:38 +0200 Subject: [PATCH 13/22] actions: set JAVA_HOME in env --- .github/workflows/macOS_gcc10.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macOS_gcc10.yml b/.github/workflows/macOS_gcc10.yml index 18b990e5100..67193e599d1 100644 --- a/.github/workflows/macOS_gcc10.yml +++ b/.github/workflows/macOS_gcc10.yml @@ -14,6 +14,7 @@ env: HOMEBREW_NO_INSTALL_CLEANUP: 1 CC: gcc-10 CXX: g++-10 + JAVA_HOME: $(/usr/libexec/java_home -v 14) jobs: build: @@ -28,6 +29,7 @@ jobs: - name: Install Dependencies run: | + echo $JAVA_HOME brew update brew config brew install augeas @@ -68,7 +70,6 @@ jobs: run: | PATH="/usr/local/opt/ruby@2.7/bin:/usr/local/lib/ruby/gems/2.7.0/bin:$PATH" PATH="/usr/local/opt/python@3.9/bin:$PATH" - JAVA_HOME="$(/usr/libexec/java_home -v 14)" echo $JAVA_HOME which java java --version @@ -111,5 +112,6 @@ jobs: # Execute tests defined by the CMake configuration. # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail run: | + echo $JAVA_HOME cmake --build . --target run_all kdb run_all From 1265f8ee1f06944b96c975334f1ff1725fbb16ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Fri, 2 Apr 2021 18:30:43 +0200 Subject: [PATCH 14/22] actions: set JAVA_HOME dynamically --- .github/workflows/macOS_gcc10.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/macOS_gcc10.yml b/.github/workflows/macOS_gcc10.yml index 67193e599d1..9d9d4ca9c32 100644 --- a/.github/workflows/macOS_gcc10.yml +++ b/.github/workflows/macOS_gcc10.yml @@ -14,7 +14,6 @@ env: HOMEBREW_NO_INSTALL_CLEANUP: 1 CC: gcc-10 CXX: g++-10 - JAVA_HOME: $(/usr/libexec/java_home -v 14) jobs: build: @@ -29,7 +28,6 @@ jobs: - name: Install Dependencies run: | - echo $JAVA_HOME brew update brew config brew install augeas @@ -70,6 +68,7 @@ jobs: run: | PATH="/usr/local/opt/ruby@2.7/bin:/usr/local/lib/ruby/gems/2.7.0/bin:$PATH" PATH="/usr/local/opt/python@3.9/bin:$PATH" + echo "JAVA_HOME=$(/usr/libexec/java_home -v 14)" >> $GITHUB_ENV echo $JAVA_HOME which java java --version From 912e5efc1da95307dab4bee71722d4718c6723a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Fri, 2 Apr 2021 18:37:42 +0200 Subject: [PATCH 15/22] actions: use adoptopenjdk --- .github/workflows/macOS_gcc10.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macOS_gcc10.yml b/.github/workflows/macOS_gcc10.yml index 9d9d4ca9c32..f07380151dd 100644 --- a/.github/workflows/macOS_gcc10.yml +++ b/.github/workflows/macOS_gcc10.yml @@ -68,7 +68,7 @@ jobs: run: | PATH="/usr/local/opt/ruby@2.7/bin:/usr/local/lib/ruby/gems/2.7.0/bin:$PATH" PATH="/usr/local/opt/python@3.9/bin:$PATH" - echo "JAVA_HOME=$(/usr/libexec/java_home -v 14)" >> $GITHUB_ENV + echo "JAVA_HOME=$JAVA_HOME_14_X64" >> $GITHUB_ENV echo $JAVA_HOME which java java --version From bb87f474ec2ba6858d5723919a9f50ec42cee30d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Fri, 2 Apr 2021 18:59:00 +0200 Subject: [PATCH 16/22] actions: use setup-* actions to prepare java, ruby, python env --- .github/workflows/macOS_gcc10.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macOS_gcc10.yml b/.github/workflows/macOS_gcc10.yml index f07380151dd..80d6c4a2737 100644 --- a/.github/workflows/macOS_gcc10.yml +++ b/.github/workflows/macOS_gcc10.yml @@ -25,6 +25,18 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: actions/setup-java@v1 + with: + java-version: '14' # The JDK version to make available on the path. + java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk + architecture: x64 # (x64 or x86) - defaults to x64 + - uses: actions/setup-python@v2 + with: + python-version: '3.x' # Version range or exact version of a Python version to use, using SemVer's version range syntax + architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified + - uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.7 # Not needed with a .ruby-version file - name: Install Dependencies run: | @@ -68,10 +80,7 @@ jobs: run: | PATH="/usr/local/opt/ruby@2.7/bin:/usr/local/lib/ruby/gems/2.7.0/bin:$PATH" PATH="/usr/local/opt/python@3.9/bin:$PATH" - echo "JAVA_HOME=$JAVA_HOME_14_X64" >> $GITHUB_ENV echo $JAVA_HOME - which java - java --version SYSTEM_DIR="$PWD/kdbsystem" CMAKE_OPT+=( -GNinja @@ -111,6 +120,5 @@ jobs: # Execute tests defined by the CMake configuration. # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail run: | - echo $JAVA_HOME cmake --build . --target run_all kdb run_all From 52ae0de0eb3072e1798e2ab032e32f56dd6fd531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Sat, 3 Apr 2021 19:27:38 +0200 Subject: [PATCH 17/22] actions: use jdk 11 (LTS) and cleanup --- .github/workflows/macOS_gcc10.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/macOS_gcc10.yml b/.github/workflows/macOS_gcc10.yml index 80d6c4a2737..7b012565235 100644 --- a/.github/workflows/macOS_gcc10.yml +++ b/.github/workflows/macOS_gcc10.yml @@ -27,7 +27,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 with: - java-version: '14' # The JDK version to make available on the path. + java-version: '11' # The JDK version to make available on the path. java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk architecture: x64 # (x64 or x86) - defaults to x64 - uses: actions/setup-python@v2 @@ -78,9 +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: | - PATH="/usr/local/opt/ruby@2.7/bin:/usr/local/lib/ruby/gems/2.7.0/bin:$PATH" - PATH="/usr/local/opt/python@3.9/bin:$PATH" - echo $JAVA_HOME SYSTEM_DIR="$PWD/kdbsystem" CMAKE_OPT+=( -GNinja @@ -97,7 +94,6 @@ jobs: -DKDB_DEFAULT_STORAGE="${KDB_DEFAULT_STORAGE:-dump}" -DKDB_DB_FILE="${KDB_DB_FILE:-default.ecf}" -DKDB_DB_INIT="${KDB_DB_INIT:-elektra.ecf}" - $TRAVIS_BUILD_DIR ) printf '—— CMake Config ——\n' for option in "${CMAKE_OPT[@]}"; do printf '%s\n' "$option"; done From 192cb3bd0e7ed2bbecf5da8d21e41c29225f7759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Sun, 4 Apr 2021 12:55:24 +0200 Subject: [PATCH 18/22] actions: set JAVA_HOME manually --- .github/workflows/macOS_gcc10.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/macOS_gcc10.yml b/.github/workflows/macOS_gcc10.yml index 7b012565235..f6484cb93c8 100644 --- a/.github/workflows/macOS_gcc10.yml +++ b/.github/workflows/macOS_gcc10.yml @@ -61,6 +61,7 @@ jobs: - name: Setup Build Environment run: | + echo "JAVA_HOME=$(/usr/libexec/java_home --failfast)" >> $GITHUB_ENV gem install test-unit --no-document pip2 install cheetah # Required by kdb-gen brew tap homebrew/services @@ -78,6 +79,10 @@ 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 @@ -116,5 +121,9 @@ 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 From 5ece28786fea9d573f25af59107a900c4f48c9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Sun, 4 Apr 2021 17:54:25 +0200 Subject: [PATCH 19/22] actions: use openjdk and set PATH, ENV manually --- .github/workflows/macOS_gcc10.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macOS_gcc10.yml b/.github/workflows/macOS_gcc10.yml index f6484cb93c8..2bc5c1e88f2 100644 --- a/.github/workflows/macOS_gcc10.yml +++ b/.github/workflows/macOS_gcc10.yml @@ -25,11 +25,6 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: '11' # The JDK version to make available on the path. - java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk - architecture: x64 # (x64 or x86) - defaults to x64 - uses: actions/setup-python@v2 with: python-version: '3.x' # Version range or exact version of a Python version to use, using SemVer's version range syntax @@ -54,6 +49,7 @@ jobs: brew install libuv brew install lua brew install ninja + brew install openjdk brew install qt brew install swig brew install yajl @@ -61,7 +57,13 @@ jobs: - name: Setup Build Environment run: | - echo "JAVA_HOME=$(/usr/libexec/java_home --failfast)" >> $GITHUB_ENV + 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 + which java + which javac + java --version + javac --version gem install test-unit --no-document pip2 install cheetah # Required by kdb-gen brew tap homebrew/services From 34036d42776f43882731a2228d13813c0d1c865a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Mon, 5 Apr 2021 13:13:25 +0200 Subject: [PATCH 20/22] actions: path not set in step --- .github/workflows/macOS_gcc10.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/macOS_gcc10.yml b/.github/workflows/macOS_gcc10.yml index 2bc5c1e88f2..57df8d1dd15 100644 --- a/.github/workflows/macOS_gcc10.yml +++ b/.github/workflows/macOS_gcc10.yml @@ -60,10 +60,6 @@ jobs: 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 - which java - which javac - java --version - javac --version gem install test-unit --no-document pip2 install cheetah # Required by kdb-gen brew tap homebrew/services From 65e7f4c0a400072253423693c2cf585261088416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Tue, 6 Apr 2021 15:09:53 +0200 Subject: [PATCH 21/22] actions: exclude jni due to #3747 --- .github/workflows/macOS_gcc10.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/macOS_gcc10.yml b/.github/workflows/macOS_gcc10.yml index 57df8d1dd15..83286db23a5 100644 --- a/.github/workflows/macOS_gcc10.yml +++ b/.github/workflows/macOS_gcc10.yml @@ -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' BINDINGS: 'ALL;-rust' # Skip homebrew cleanup to avoid issues with removal of packages HOMEBREW_NO_INSTALL_CLEANUP: 1 @@ -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 @@ -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 @@ -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 From d1b5ebad73b1f039978984d663b4a7c63855eb5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihael=20Pranji=C4=87?= Date: Tue, 6 Apr 2021 15:12:34 +0200 Subject: [PATCH 22/22] doc: update release notes --- doc/news/_preparation_next_release.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/news/_preparation_next_release.md b/doc/news/_preparation_next_release.md index 0b106ee6def..fcc3fb8e5b3 100644 --- a/doc/news/_preparation_next_release.md +++ b/doc/news/_preparation_next_release.md @@ -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ć)_ - <> - <>