Skip to content

Commit

Permalink
update CI scripts to match main build
Browse files Browse the repository at this point in the history
  • Loading branch information
hgschmie committed Feb 3, 2024
1 parent 127a763 commit 13cb028
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 21
distribution: temurin
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
git config --global user.name github-cd-action
git config --global user.email github-cd-action@jdbi.org
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 21
distribution: temurin
Expand Down
31 changes: 28 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java-version: [ 11, 17, 21 ]
java-version: [ 11, 17, 21, 22-ea ]

steps:
- uses: actions/checkout@v4

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
id: build_jdk
with:
java-version: 21
distribution: temurin
cache: maven

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
id: test_jdk
with:
java-version: ${{ matrix.java-version }}
Expand Down Expand Up @@ -58,3 +58,28 @@ jobs:
MAVEN_CONFIG: "-B -fae"
run: |
make run-tests
ci-locale:
name: Run tests with different timezone and locale
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- uses: actions/setup-java@v4
with:
java-version: 21
distribution: temurin
cache: maven

- name: install code
env:
MAVEN_CONFIG: "-B -fae"
run: |
make install-fast
- name: run tests
env:
MAVEN_CONFIG: "-B -fae -Djdbi.test.timezone=Asia/Colombo -Djdbi.test.language=tr -Djdbi.test.region=TR"
run: |
make run-tests
27 changes: 26 additions & 1 deletion .github/workflows/slow-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 21
distribution: temurin
Expand All @@ -34,3 +34,28 @@ jobs:
MAVEN_CONFIG: "-B -fae"
run: |
make run-slow-tests
slow-tests-locale:
name: Run slow tests with different timezone and locale
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- uses: actions/setup-java@v4
with:
java-version: 21
distribution: temurin
cache: maven

- name: install code
env:
MAVEN_CONFIG: "-B -fae"
run: |
make install-fast
- name: run slow tests
env:
MAVEN_CONFIG: "-B -fae -Djdbi.test.timezone=Asia/Colombo -Djdbi.test.language=tr -Djdbi.test.region=TR"
run: |
make run-slow-tests
2 changes: 1 addition & 1 deletion .github/workflows/style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 21
distribution: temurin
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
java-version: 21
distribution: temurin
Expand Down

0 comments on commit 13cb028

Please sign in to comment.