Skip to content

Commit

Permalink
Merge branch 'hotfix/3.9.4.002' into hotfix/3.9.4.002-local/adempiere…
Browse files Browse the repository at this point in the history
…#4243-Fixed-Transaction-File-Storage
  • Loading branch information
yamelsenih committed Dec 3, 2023
2 parents 52b0190 + ec89e2a commit 8e548d5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build_with_gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ name: ADempiere Build With gradle
on:
# Triggers the workflow on push or pull request events but only for the develop branch
push:
branches: [ "master", "develop", "bugfix/*", "feature/*" ]
branches: [ "master", "develop", "bugfix/*", "hotfix/*", "feature/*" ]
pull_request:
branches: [ "master", "develop", "bugfix/*", "feature/*" ]
branches: [ "master", "develop", "bugfix/*", "hotfix/*", "feature/*" ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ 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/*", "feature/*" ]
branches: [ "master", "develop", "bugfix/*", "hotfix/*", "feature/*" ]
pull_request:
branches: [ "master", "develop", "bugfix/*", "feature/*" ]
branches: [ "master", "develop", "bugfix/*", "hotfix/*", "feature/*" ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
Expand Down

0 comments on commit 8e548d5

Please sign in to comment.