From 13cb02820f3a7f6bceb03f29b8afb6562bdba382 Mon Sep 17 00:00:00 2001 From: "Henning P. Schmiedehausen" Date: Sat, 3 Feb 2024 13:23:41 -0800 Subject: [PATCH] update CI scripts to match main build --- .github/workflows/cd.yml | 4 ++-- .github/workflows/ci.yml | 31 ++++++++++++++++++++++++++++--- .github/workflows/slow-tests.yml | 27 ++++++++++++++++++++++++++- .github/workflows/style.yml | 2 +- .github/workflows/versions.yml | 2 +- 5 files changed, 58 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 9b05fe8..6207a68 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -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 @@ -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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a352a2..e5f03c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 }} @@ -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 diff --git a/.github/workflows/slow-tests.yml b/.github/workflows/slow-tests.yml index e78ca65..ef163d8 100644 --- a/.github/workflows/slow-tests.yml +++ b/.github/workflows/slow-tests.yml @@ -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 @@ -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 diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index e2d6235..bdbdd1d 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -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 diff --git a/.github/workflows/versions.yml b/.github/workflows/versions.yml index eb6f0bc..a81b3d6 100644 --- a/.github/workflows/versions.yml +++ b/.github/workflows/versions.yml @@ -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