Skip to content

Commit 6a4160e

Browse files
author
subshell GmbH – Team Korora
authored
Merge branch 'testcontainers:master' into master
2 parents b901227 + 3b3d130 commit 6a4160e

File tree

726 files changed

+23978
-7298
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

726 files changed

+23978
-7298
lines changed

.circleci/config.yml

Lines changed: 3 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,12 @@
11
version: 2
22
jobs:
3-
core:
3+
minimal_core:
44
machine:
55
enabled: true
66
steps:
77
- checkout
88
- run:
9-
command: ./gradlew testcontainers:build -x test -x check
10-
- run:
11-
command: ./gradlew testcontainers:check --scan
12-
- run:
13-
name: Save test results
14-
command: |
15-
mkdir -p ~/junit/
16-
find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/junit/ \;
17-
when: always
18-
- store_test_results:
19-
path: ~/junit
20-
- store_artifacts:
21-
path: ~/junit
22-
modules-no-jdbc-test-no-selenium:
23-
machine:
24-
enabled: true
25-
steps:
26-
- checkout
27-
- run:
28-
command: ./gradlew check -x testcontainers:check -x selenium:check -x jdbc-test:check
29-
--scan
30-
environment:
31-
TZ: /usr/share/zoneinfo/ETC/UTC
32-
- run:
33-
name: Save test results
34-
command: |
35-
mkdir -p ~/junit/
36-
find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/junit/ \;
37-
when: always
38-
- store_test_results:
39-
path: ~/junit
40-
- store_artifacts:
41-
path: ~/junit
42-
modules-jdbc-test:
43-
machine:
44-
enabled: true
45-
steps:
46-
- checkout
47-
- run:
48-
command: ./gradlew jdbc-test:check --scan
49-
environment:
50-
TZ: /usr/share/zoneinfo/ETC/UTC
51-
- run:
52-
name: Save test results
53-
command: |
54-
mkdir -p ~/junit/
55-
find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/junit/ \;
56-
when: always
57-
- store_test_results:
58-
path: ~/junit
59-
- store_artifacts:
60-
path: ~/junit
61-
selenium:
62-
machine:
63-
enabled: true
64-
steps:
65-
- checkout
66-
- run:
67-
command: ./gradlew selenium:check --scan
68-
- run:
69-
name: Save test results
70-
command: |
71-
mkdir -p ~/junit/
72-
find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/junit/ \;
73-
when: always
74-
- store_test_results:
75-
path: ~/junit
76-
- store_artifacts:
77-
path: ~/junit
78-
examples:
79-
machine:
80-
enabled: true
81-
steps:
82-
- checkout
83-
- run:
84-
command: cd examples && ../gradlew check
9+
command: ./gradlew --no-daemon --continue --scan testcontainers:test --tests '*GenericContainerRuleTest'
8510
- run:
8611
name: Save test results
8712
command: |
@@ -96,8 +21,4 @@ workflows:
9621
version: 2
9722
test_all:
9823
jobs:
99-
- core
100-
- modules-no-jdbc-test-no-selenium
101-
- modules-jdbc-test
102-
- selenium
103-
- examples
24+
- minimal_core

.dependabot/config.yml

Lines changed: 0 additions & 163 deletions
This file was deleted.

.editorconfig

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,15 @@ trim_trailing_whitespace = true
1414

1515
[*.md]
1616
trim_trailing_whitespace = false
17+
18+
[*.java]
19+
indent_style = space
20+
indent_size = 4
21+
# Never use star imports
22+
ij_java_names_count_to_use_import_on_demand = 99
23+
ij_java_class_count_to_use_import_on_demand = 99
24+
ij_java_layout_static_imports_separately = true
25+
26+
[*.{yml, yaml}]
27+
indent_size = 2
28+
ij_yaml_keep_indents_on_empty_lines = false

.envrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/FUNDING.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# These are supported funding model platforms
2+
3+
github: [testcontainers]
File renamed without changes.

0 commit comments

Comments
 (0)