Merge remote-tracking branch 'upstream/hotfix/3.9.4.002' into hotfix/…

…3.9.4.002-local/#HR-Improve-InMemmory-Using
erpcya · Dec 12, 2023 · b6b6c38 · b6b6c38
2 parents d8e96d9 + 54a334c
commit b6b6c38
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 8 deletions.
diff --git a/.github/workflows/build_with_gradle.yml b/.github/workflows/build_with_gradle.yml
@@ -1,15 +1,30 @@
 # This is a basic workflow to help you get started with Actions
 # This file was contributed by Carlos Parada and Yamel Senih from ERP Consultores y Asociados, C.A
+# Modifications by Edwin Betancourt
 
 name: ADempiere Build With gradle
 
 # Controls when the action will run. 
 on:
   # Triggers the workflow on push or pull request events but only for the develop branch
   push:
-   branches: [ "master", "develop", "bugfix/*", "hotfix/*", "feature/*" ]
+   branches:
+        - main
+        - master
+        - develop
+        - bugfix/**
+        - feature/**
+        - hotfix/**
+        - test/**
   pull_request:
-    branches: [ "master", "develop", "bugfix/*", "hotfix/*", "feature/*" ]
+    branches:
+        - main
+        - master
+        - develop
+        - bugfix/**
+        - feature/**
+        - hotfix/**
+        - test/**
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -34,7 +49,3 @@ jobs:
         run: gradle build
         env:
           ADEMPIERE_LIBRARY_VERSION: 'test-version'
-          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.PGP_SECRET }}
-          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.PGP_PASSPHRASE }}
-          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_TOKEN }}
-          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.OSSRH_USERNAME }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,6 +1,7 @@
 # This is a basic workflow to help you get started with Actions
 # This file was contributed by Carlos Parada and Yamel Senih from ERP Consultores y Asociados, C.A.
 # Modifications by Mario Calderon, Systemhaus Westfalia 
+# Modifications by Edwin Betancourt
 
 name: ADempiere Build With ANT
 
@@ -9,9 +10,23 @@ on:
   # Triggers the workflow on push or pull request events with prefix "bugfix/" or "feature/". 
   # It builds and installs always; create a database seed in Postgres only when xml migration files changed.
   push:
-    branches: [ "master", "develop", "bugfix/*", "hotfix/*", "feature/*" ]
+    branches:
+        - main
+        - master
+        - develop
+        - bugfix/**
+        - feature/**
+        - hotfix/**
+        - test/**
   pull_request:
-    branches: [ "master", "develop", "bugfix/*", "hotfix/*", "feature/*" ]
+    branches:
+        - main
+        - master
+        - develop
+        - bugfix/**
+        - feature/**
+        - hotfix/**
+        - test/**
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -76,8 +91,15 @@ jobs:
             xml-files:
               - 'migration/**/*.xml'
               - '.github/workflows/*.yml'
+              # ant build
               - 'build.xml'
+              - '**/build.xml'
+              # shell/batch files
               - 'utils/RUN*.*'
+              # standalone libs
+              - 'lib/*-ds.xml'
+              - 'lib/*.jar'
+              - 'tools/lib/*.jar'
 
       # Build ADempiere with ant, if there are changes in XML files
       - name: Build Adempiere with database restore...