Merge branch '3.1.x'

This commit is contained in:
Ryan Baxter
2024-09-04 14:01:55 -04:00
4 changed files with 7 additions and 7 deletions

View File

@@ -35,7 +35,7 @@ jobs:
- name: setup project jdk-17
id: jdk_17
uses: ./.github/workflows/composites/setup-jdk17
if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x'
if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x' || env.BASE_BRANCH == '3.1.x'
- name: cache local maven repository
uses: ./.github/workflows/composites/cache
@@ -115,7 +115,7 @@ jobs:
- name: setup project jdk-17
uses: ./.github/workflows/composites/setup-jdk17
if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x'
if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x' || env.BASE_BRANCH == '3.1.x'
- name: pre-test-actions
uses: ./.github/workflows/composites/pre-test-actions
@@ -159,7 +159,7 @@ jobs:
- name: setup project jdk-17
uses: ./.github/workflows/composites/setup-jdk17
if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x'
if: env.BASE_BRANCH == 'main' || env.BASE_BRANCH == '3.0.x' || env.BASE_BRANCH == '3.1.x'
- name: pre-test-actions
uses: ./.github/workflows/composites/pre-test-actions