Skip to content

Commit

Permalink
bump CI versions; streamline JDK matrix
Browse files Browse the repository at this point in the history
  • Loading branch information
seancorfield committed Sep 24, 2023
1 parent 190958b commit c6b4587
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build-and-release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-java@v3
Expand All @@ -19,7 +19,7 @@ jobs:
- name: Setup Clojure
uses: DeLaGuardo/setup-clojure@master
with:
cli: '1.11.1.1347'
cli: '1.11.1.1413'
- name: Cache All The Things
uses: actions/cache@v3
with:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/test-and-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ jobs:
build-and-snapshot:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
- name: Setup Clojure
uses: DeLaGuardo/setup-clojure@master
with:
cli: '1.11.1.1347'
cli: '1.11.1.1413'
- name: Cache All The Things
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -54,17 +54,17 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '11', '17' ]
java: [ '11', '17', '20' ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
- name: Setup Clojure
uses: DeLaGuardo/setup-clojure@master
with:
cli: '1.11.1.1347'
cli: '1.11.1.1413'
- name: Cache All The Things
uses: actions/cache@v3
with:
Expand All @@ -84,7 +84,7 @@ jobs:
graalvm: [ '21.1.0' ]
base: [ 'java11', 'java16' ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup GraalVM
uses: DeLaGuardo/setup-graalvm@5.0
with:
Expand All @@ -93,7 +93,7 @@ jobs:
- name: Setup Clojure
uses: DeLaGuardo/setup-clojure@master
with:
cli: '1.11.1.1347'
cli: '1.11.1.1413'
- name: Cache All The Things
uses: actions/cache@v3
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '11', '16', '17', '18' ]
java: [ '11', '17', '20' ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
- name: Setup Clojure
uses: DeLaGuardo/setup-clojure@master
with:
cli: '1.11.1.1347'
cli: '1.11.1.1413'
- name: Cache All The Things
uses: actions/cache@v3
with:
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
graalvm: [ '21.1.0' ]
base: [ 'java11', 'java16' ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup GraalVM
uses: DeLaGuardo/setup-graalvm@5.0
with:
Expand All @@ -61,7 +61,7 @@ jobs:
- name: Setup Clojure
uses: DeLaGuardo/setup-clojure@master
with:
cli: '1.11.1.1347'
cli: '1.11.1.1413'
- name: Cache All The Things
uses: actions/cache@v3
with:
Expand Down
16 changes: 8 additions & 8 deletions deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@
org.apache.derby/derby {:mvn/version "10.15.2.0"}
org.apache.derby/derbyshared {:mvn/version "10.15.2.0"}
org.hsqldb/hsqldb {:mvn/version "2.7.2"}
com.h2database/h2 {:mvn/version "2.1.214"}
com.h2database/h2 {:mvn/version "2.2.224"}
net.sourceforge.jtds/jtds {:mvn/version "1.3.1"}
org.mariadb.jdbc/mariadb-java-client {:mvn/version "3.1.4"}
com.mysql/mysql-connector-j {:mvn/version "8.0.33"}
org.mariadb.jdbc/mariadb-java-client {:mvn/version "3.2.0"}
com.mysql/mysql-connector-j {:mvn/version "8.1.0"}
org.postgresql/postgresql {:mvn/version "42.6.0"}
io.zonky.test/embedded-postgres {:mvn/version "2.0.4"}
io.zonky.test.postgres/embedded-postgres-binaries-darwin-amd64 {:mvn/version "15.3.0"}
io.zonky.test.postgres/embedded-postgres-binaries-linux-amd64 {:mvn/version "15.3.0"}
io.zonky.test.postgres/embedded-postgres-binaries-windows-amd64 {:mvn/version "15.3.0"}
org.xerial/sqlite-jdbc {:mvn/version "3.42.0.0"}
com.microsoft.sqlserver/mssql-jdbc {:mvn/version "11.2.0.jre11"}
io.zonky.test.postgres/embedded-postgres-binaries-darwin-amd64 {:mvn/version "16.0.0"}
io.zonky.test.postgres/embedded-postgres-binaries-linux-amd64 {:mvn/version "16.0.0"}
io.zonky.test.postgres/embedded-postgres-binaries-windows-amd64 {:mvn/version "16.0.0"}
org.xerial/sqlite-jdbc {:mvn/version "3.43.0.0"}
com.microsoft.sqlserver/mssql-jdbc {:mvn/version "12.4.1.jre11"}
;; supplementary test stuff
;; use log4j 2.x:
org.apache.logging.log4j/log4j-api {:mvn/version "2.20.0"}
Expand Down

0 comments on commit c6b4587

Please sign in to comment.