This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit c55ee999a11b6e67a5039d63c9d4dbd5fa6bb659
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Mon Jan 1 11:22:53 2024 +0100
Implemented: Replace SvnCheckout in Gradle (OFBIZ-12868) (INFRA-25327)
The pullAllPluginsSource.script is used in several CI places (GitHub
actions,
BuildBot and Demos)
Lastly I committed the pullAllPluginsSource.sh and pullPluginSource.sh
scripts
with Windows. As Windows has not the x flag, they were not set as
executable.
This fixes it by setting them as executable using "git update-index
--chmod=+x"
This also changes docker-image.yaml and gradle.yaml to use
pullAllPluginsSource
I removed the build in docker-image.yaml as it's not longer needed. Only
pullAllPluginsSource was used and this task does not build anything. It just
pulls the sources
I did not set the the x flag for Windows scripts as it will be useless
anyway
since Windows does not use the x flag
Conflicts handled by in .github/workflows/gradle.yaml
---
.github/workflows/docker-image.yaml | 8 ++++----
.github/workflows/gradle.yaml | 11 +++++++----
pullAllPluginsSource.sh | 0
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/docker-image.yaml
b/.github/workflows/docker-image.yaml
index 08fd035213..eacae7eb88 100644
--- a/.github/workflows/docker-image.yaml
+++ b/.github/workflows/docker-image.yaml
@@ -133,10 +133,10 @@ jobs:
java-version: 8
distribution: temurin
cache: 'gradle'
- - name: Grant execute permission for gradlew
- run: chmod +x gradlew
- - name: Build with Gradle
- run: ./gradlew pullAllPluginsSource
+ - name: Grant execute permission for gradlew and pullAllPluginsSource.sh
+ run: chmod +x gradlew pullAllPluginsSource.sh
+ - name: Load all plugins
+ run: ./pullAllPluginsSource.sh
- name: Determine metadata (tags, labels) for Docker framework with
plugins build
id: pluginsmeta
uses: docker/metadata-action@507c2f2dc502c992ad446e3d7a5dfbe311567a96
diff --git a/.github/workflows/gradle.yaml b/.github/workflows/gradle.yaml
index 83c280730f..7c68d8dda1 100644
--- a/.github/workflows/gradle.yaml
+++ b/.github/workflows/gradle.yaml
@@ -15,7 +15,7 @@
# This workflow will check style in OFBiz with its plugins
-# For more information see:
https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+# For more information see: https://github.com/actions/setup-java
name: Java CI with Gradle
@@ -36,10 +36,13 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 1.8
- - name: Grant execute permission for gradlew
- run: chmod +x gradlew
+ cache: 'gradle'
+ - name: Grant execute permission for gradlew and pullAllPluginsSource.sh
+ run: chmod +x gradlew pullAllPluginsSource.sh
+ - name: Load all plugins
+ run: ./pullAllPluginsSource.sh
- name: Build with Gradle
- run: ./gradlew pullAllPluginsSource check
+ run: ./gradlew check javadoc
# Below does not work, see
https://lists.apache.org/thread/80wzf4kclfk5nh2fss56jd6otf7y4n2f
# - name: Builds with Gradle, checks style and run integration tests (just
to know if they pass)
# run: ./gradlew pullAllPluginsSource check loadAll testIntegration
diff --git a/pullAllPluginsSource.sh b/pullAllPluginsSource.sh
old mode 100644
new mode 100755
