Merge branch 'master' into fixbuild

zio · Nov 19, 2024 · 12dad03 · 12dad03
2 parents 2e6f34b + ea039f9
commit 12dad03
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
     timeout-minutes: 15
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.2
       - name: Cache sbt
         uses: actions/cache@v4
         with:
@@ -29,7 +29,7 @@ jobs:
           key: ${{ runner.os }}-${{matrix.scala}}-${{matrix.module}}-${{ hashFiles('**/build.sbt') }}
 
       - name: Setup Java
-        uses: actions/setup-java@v4.3.0
+        uses: actions/setup-java@v4.5.0
         with:
           distribution: temurin
           java-version: '17'
@@ -77,7 +77,7 @@ jobs:
     name: Build ${{matrix.scala_short_dot}} - ${{matrix.module}}
 
     steps:
-    - uses: actions/checkout@v4.2.0
+    - uses: actions/checkout@v4.2.2
     - name: Cache sbt
       uses: actions/cache@v4
       with:
@@ -87,7 +87,7 @@ jobs:
         key: ${{ runner.os }}-${{matrix.scala}}-${{matrix.module}}-${{ hashFiles('**/build.sbt') }}
 
     - name: Setup Java
-      uses: actions/setup-java@v4.3.0
+      uses: actions/setup-java@v4.5.0
       with:
         distribution: temurin
         java-version: '17'
@@ -108,9 +108,9 @@ jobs:
       CI_RELEASE: publishSigned # By default, sbt-ci-release uses the `+publishSigned` which is publishing for all the Scala versions configured, which is not what we want
       CI_SNAPSHOT_RELEASE: publish # By default, sbt-ci-release uses the `+publish` which is publishing for all the Scala versions configured, which is not what we want
     steps:
-      - uses: actions/checkout@v4.2.0
+      - uses: actions/checkout@v4.2.2
       - name: Setup Java
-        uses: actions/setup-java@v4.3.0
+        uses: actions/setup-java@v4.5.0
         with:
           distribution: temurin
           java-version: '11'

diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml
@@ -18,11 +18,11 @@ jobs:
     if: ${{ github.event_name == 'pull_request' }}
     steps:
     - name: Git Checkout
-      uses: actions/checkout@v4.2.0
+      uses: actions/checkout@v4.2.2
       with:
         fetch-depth: '0'
     - name: Setup Scala
-      uses: actions/setup-java@v4.3.0
+      uses: actions/setup-java@v4.5.0
       with:
         distribution: temurin
         java-version: 17
@@ -39,11 +39,11 @@ jobs:
     if: ${{ ((github.event_name == 'release') && (github.event.action == 'published')) || (github.event_name == 'workflow_dispatch') }}
     steps:
     - name: Git Checkout
-      uses: actions/checkout@v4.2.0
+      uses: actions/checkout@v4.2.2
       with:
         fetch-depth: '0'
     - name: Setup Scala
-      uses: actions/setup-java@v4.3.0
+      uses: actions/setup-java@v4.5.0
       with:
         distribution: temurin
         java-version: 17
@@ -63,12 +63,12 @@ jobs:
     if: ${{ (github.event_name == 'push') || ((github.event_name == 'release') && (github.event.action == 'published')) }}
     steps:
     - name: Git Checkout
-      uses: actions/checkout@v4.2.0
+      uses: actions/checkout@v4.2.2
       with:
         ref: ${{ github.head_ref }}
         fetch-depth: '0'
     - name: Setup Scala
-      uses: actions/setup-java@v4.3.0
+      uses: actions/setup-java@v4.5.0
       with:
         distribution: temurin
         java-version: 17

diff --git a/build.sbt b/build.sbt
@@ -531,7 +531,7 @@ lazy val `quill-test-kit` =
 
 lazy val jdbcTestingLibraries = Seq(
   libraryDependencies ++= Seq(
-    "com.zaxxer"              % "HikariCP"                % "6.0.0" exclude ("org.slf4j", "*"),
+    "com.zaxxer"              % "HikariCP"                % "6.2.1" exclude ("org.slf4j", "*"),
     "com.mysql"               % "mysql-connector-j"       % "9.0.0"       % Test,
     "com.h2database"          % "h2"                      % "2.3.232"     % Test,
     "org.postgresql"          % "postgresql"              % "42.7.4"      % Test,