Skip to content

Commit bd1b09b

Browse files
Maksim Kostromindaggerok
Maksim Kostromin
authored andcommitted
Upgrade testcontainers up to 1.18.3 version. Fix GitHub actions: setup-java, etc.
1 parent 56a2e22 commit bd1b09b

File tree

3 files changed

+27
-34
lines changed

3 files changed

+27
-34
lines changed

.github/workflows/gradle.yml

+11-21
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,25 @@
11
name: Gradle
22
on: [push]
3+
env:
4+
JAVA_VERSION: '8'
35
jobs:
46
ui:
5-
strategy:
6-
matrix:
7-
java: [8]
8-
os: [ubuntu-latest]
9-
nodejs-version: [12]
10-
python-version: [3.8]
11-
docker-version: [19.09]
12-
docker-channel: [stable]
13-
name: ui java ${{ matrix.java }} on ${{ matrix.os }}
14-
runs-on: ${{ matrix.os }}
7+
name: ui gradle
8+
runs-on: ubuntu-latest
159

1610
steps:
1711
- name: Git clone
18-
uses: actions/checkout@v1
12+
uses: actions/checkout@v3
1913

20-
- name: Setup Docker ${{ matrix.docker-channel }} ${{ matrix.docker-version }}
21-
uses: docker-practice/actions-setup-docker@master
14+
- name: Setup java ${{ env.JAVA_VERSION }}
15+
uses: actions/setup-java@v3
2216
with:
23-
docker_version: ${{ matrix.docker-version }}
24-
docker_channel: ${{ matrix.docker-channel }}
25-
26-
- name: Setup java ${{ matrix.java }}
27-
uses: actions/setup-java@v1
28-
with:
29-
java-version: ${{ matrix.java }}
17+
# 'temurin' 'zulu' 'adopt' 'adopt-hotspot' 'adopt-openj9' 'liberica' 'microsoft'
18+
distribution: 'temurin'
19+
java-version: ${{ env.JAVA_VERSION }}
3020

3121
- name: Cache gradle deps ~/.gradle
32-
uses: actions/cache@v1
22+
uses: actions/cache@v3
3323
with:
3424
path: ~/.gradle
3525
key: ${{ runner.os }}-${{ matrix.os }}-gradle-

.github/workflows/ui.yml

+15-12
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
name: UI
22
on: [push]
3+
env:
4+
JAVA_VERSION: '11'
35
jobs:
46
ui:
57
strategy:
68
matrix:
7-
java: [11]
89
os: [ubuntu-latest]
910
nodejs-version: [12]
1011
python-version: [3.8]
1112
docker-version: [19.09]
1213
docker-channel: [stable]
13-
name: ui java ${{ matrix.java }} on ${{ matrix.os }}
14+
name: ui on ${{ matrix.os }}
1415
runs-on: ${{ matrix.os }}
1516

1617
steps:
1718
- name: Git clone
18-
uses: actions/checkout@v1
19+
uses: actions/checkout@v3
1920

2021
- name: Set up Python ${{ matrix.python-version }}
21-
uses: actions/setup-python@v1
22+
uses: actions/setup-python@v3
2223
with:
2324
python-version: ${{ matrix.python-version }}
2425
- name: Cache python ${{ matrix.python-version }} deps
25-
uses: actions/cache@v1
26+
uses: actions/cache@v3
2627
with:
2728
path: ~/.pip
2829
key: ${{ runner.os }}-${{ matrix.os }}-pip-
@@ -39,19 +40,19 @@ jobs:
3940
docker_version: ${{ matrix.docker-version }}
4041
docker_channel: ${{ matrix.docker-channel }}
4142
- name: Cache docker ${{ matrix.docker-channel }} ${{ matrix.docker-version }}
42-
uses: actions/cache@v1
43+
uses: actions/cache@v3
4344
with:
4445
path: ~/.docker
4546
key: ${{ runner.os }}-${{ matrix.os }}-docker-${{ hashFiles('**/Dockerfile*') }}
4647
restore-keys: |
4748
${{ runner.os }}-${{ matrix.os }}-docker-
4849
4950
- name: Setup NodeJS ${{ matrix.nodejs-version }}
50-
uses: actions/setup-node@v1
51+
uses: actions/setup-node@v3
5152
with:
5253
node-version: ${{ matrix.nodejs-version }}
5354
- name: Cache npm ${{ matrix.nodejs-version }} deps
54-
uses: actions/cache@v1
55+
uses: actions/cache@v3
5556
with:
5657
path: ~/.npm
5758
key: ${{ runner.os }}-${{ matrix.os }}-npm-
@@ -60,13 +61,15 @@ jobs:
6061
- name: Install npm apps (wait-port)
6162
run: npm install -g wait-port
6263

63-
- name: Setup java ${{ matrix.java }}
64-
uses: actions/setup-java@v1
64+
- name: Setup java ${{ env.JAVA_VERSION }}
65+
uses: actions/setup-java@v3
6566
with:
66-
java-version: ${{ matrix.java }}
67+
# 'temurin' 'zulu' 'adopt' 'adopt-hotspot' 'adopt-openj9' 'liberica' 'microsoft'
68+
distribution: 'temurin'
69+
java-version: ${{ env.JAVA_VERSION }}
6770

6871
- name: Cache maven deps ~/.m2/repository
69-
uses: actions/cache@v1
72+
uses: actions/cache@v3
7073
with:
7174
path: ~/.m2/repository
7275
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ junitVersion = 5.6.0
22
logbackVersion = 1.2.3
33
lombokVersion = 1.18.12
44
selenideVersion = 5.7.0
5-
testContainersVersion = 1.13.0
5+
testContainersVersion = 1.18.3

0 commit comments

Comments
 (0)