Skip to content

Commit aea9a76

Browse files
duncdrumduncdrum
authored
Merge pull request #60 from duncdrum/fix-59
Fix 59
2 parents 13e7c20 + 00cdaf9 commit aea9a76

File tree

10 files changed

+629
-43
lines changed

10 files changed

+629
-43
lines changed

‎.github/workflows/ci-java11.yml‎

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ jobs:
4545
- name: Make buildkit default
4646
uses: docker/setup-buildx-action@v3
4747
id: buildx
48-
with:
49-
install: true
5048

5149
- name: Extract metadata
5250
id: meta
@@ -72,7 +70,11 @@ jobs:
7270
with:
7371
context: .
7472
file: ./Dockerfile_j11
75-
build-args: BRANCH=master
73+
build-args: |
74+
BRANCH=master
75+
GITHUB_USERNAME=${{ github.actor }}
76+
secrets: |
77+
github_token=${{ secrets.GITHUB_TOKEN }}
7678
load: true
7779
tags: ${{ env.TEST_TAG }}
7880
cache-from: type=registry,ref=${{ env.IMAGE_NAME }}:buildcache
@@ -84,6 +86,9 @@ jobs:
8486
build-args: |
8587
BRANCH=master
8688
DISTRO_TAG=debug
89+
GITHUB_USERNAME=${{ github.actor }}
90+
secrets: |
91+
github_token=${{ secrets.GITHUB_TOKEN }}
8792
file: ./Dockerfile_j11
8893
load: true
8994
tags: ${{ env.TEST_TAG }}-debug
@@ -97,6 +102,9 @@ jobs:
97102
BRANCH=master
98103
DISTRO_TAG=nonroot
99104
USR=nonroot:nonroot
105+
GITHUB_USERNAME=${{ github.actor }}
106+
secrets: |
107+
github_token=${{ secrets.GITHUB_TOKEN }}
100108
file: ./Dockerfile_j11
101109
load: true
102110
tags: ${{ env.TEST_TAG }}-nonroot
@@ -110,6 +118,9 @@ jobs:
110118
DISTRO_TAG=debug
111119
FLAVOR=slim
112120
BRANCH=master
121+
GITHUB_USERNAME=${{ github.actor }}
122+
secrets: |
123+
github_token=${{ secrets.GITHUB_TOKEN }}
113124
file: ./Dockerfile_j11
114125
load: true
115126
tags: ${{ env.TEST_TAG }}-debug-slim
@@ -132,7 +143,7 @@ jobs:
132143
docker logs exist-ci | grep -w "Number of processors available to JVM:"
133144
134145
- name: Run tests
135-
run: bats --tap test/bats/*.bats
146+
run: bats --tap test/bats/0*.bats
136147

137148
# DP: this dynamically set the version from master
138149
- name: Get SemVer string from test image
@@ -150,7 +161,11 @@ jobs:
150161
context: ./
151162
platforms: linux/amd64,linux/arm64
152163
file: ./Dockerfile_j11
153-
build-args: BRANCH=master
164+
build-args: |
165+
BRANCH=master
166+
GITHUB_USERNAME=${{ github.actor }}
167+
secrets: |
168+
github_token=${{ secrets.GITHUB_TOKEN }}
154169
builder: ${{ steps.buildx.outputs.name }}
155170
push: true
156171
sbom: true
@@ -171,6 +186,9 @@ jobs:
171186
build-args: |
172187
DISTRO_TAG=debug
173188
BRANCH=master
189+
GITHUB_USERNAME=${{ github.actor }}
190+
secrets: |
191+
github_token=${{ secrets.GITHUB_TOKEN }}
174192
builder: ${{ steps.buildx.outputs.name }}
175193
push: true
176194
sbom: true
@@ -192,6 +210,9 @@ jobs:
192210
DISTRO_TAG=nonroot
193211
USR=nonroot:nonroot
194212
BRANCH=master
213+
GITHUB_USERNAME=${{ github.actor }}
214+
secrets: |
215+
github_token=${{ secrets.GITHUB_TOKEN }}
195216
builder: ${{ steps.buildx.outputs.name }}
196217
push: true
197218
sbom: true
@@ -214,6 +235,9 @@ jobs:
214235
build-args: |
215236
FLAVOR=slim
216237
BRANCH=master
238+
GITHUB_USERNAME=${{ github.actor }}
239+
secrets: |
240+
github_token=${{ secrets.GITHUB_TOKEN }}
217241
builder: ${{ steps.buildx.outputs.name }}
218242
push: true
219243
sbom: true
@@ -235,6 +259,9 @@ jobs:
235259
DISTRO_TAG=debug
236260
FLAVOR=slim
237261
BRANCH=master
262+
GITHUB_USERNAME=${{ github.actor }}
263+
secrets: |
264+
github_token=${{ secrets.GITHUB_TOKEN }}
238265
builder: ${{ steps.buildx.outputs.name }}
239266
push: true
240267
sbom: true
@@ -257,6 +284,9 @@ jobs:
257284
FLAVOR=slim
258285
USR=nonroot:nonroot
259286
BRANCH=master
287+
GITHUB_USERNAME=${{ github.actor }}
288+
secrets: |
289+
github_token=${{ secrets.GITHUB_TOKEN }}
260290
builder: ${{ steps.buildx.outputs.name }}
261291
push: true
262292
sbom: true

‎.github/workflows/ci-java21.yml‎

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ jobs:
4545
- name: Make buildkit default
4646
uses: docker/setup-buildx-action@v3
4747
id: buildx
48-
with:
49-
install: true
5048

5149
- name: Extract metadata
5250
id: meta
@@ -73,13 +71,21 @@ jobs:
7371
file: ./Dockerfile
7472
load: true
7573
tags: ${{ env.TEST_TAG }}
74+
secrets: |
75+
github_token=${{ secrets.GITHUB_TOKEN }}
76+
build-args: |
77+
GITHUB_USERNAME=${{ github.actor }}
7678
cache-from: type=registry,ref=${{ env.IMAGE_NAME }}:buildcache
7779

7880
- name: Build debug images for testing on CI
7981
uses: docker/build-push-action@v6
8082
with:
8183
context: .
82-
build-args: DISTRO_TAG=debug
84+
build-args: |
85+
DISTRO_TAG=debug
86+
GITHUB_USERNAME=${{ github.actor }}
87+
secrets: |
88+
github_token=${{ secrets.GITHUB_TOKEN }}
8389
file: ./Dockerfile
8490
load: true
8591
tags: ${{ env.TEST_TAG }}-debug
@@ -92,6 +98,9 @@ jobs:
9298
build-args: |
9399
DISTRO_TAG=nonroot
94100
USR=nonroot:nonroot
101+
GITHUB_USERNAME=${{ github.actor }}
102+
secrets: |
103+
github_token=${{ secrets.GITHUB_TOKEN }}
95104
file: ./Dockerfile
96105
load: true
97106
tags: ${{ env.TEST_TAG }}-nonroot
@@ -104,6 +113,9 @@ jobs:
104113
build-args: |
105114
DISTRO_TAG=debug
106115
FLAVOR=slim
116+
GITHUB_USERNAME=${{ github.actor }}
117+
secrets: |
118+
github_token=${{ secrets.GITHUB_TOKEN }}
107119
file: ./Dockerfile
108120
load: true
109121
tags: ${{ env.TEST_TAG }}-debug-slim
@@ -126,7 +138,7 @@ jobs:
126138
docker logs exist-ci | grep -w "Number of processors available to JVM:"
127139
128140
- name: Run tests
129-
run: bats --tap test/bats/*.bats
141+
run: bats --tap test/bats/0*.bats
130142

131143
# DP: this dynamically set the version from develop
132144
# no longer necessary
@@ -145,7 +157,11 @@ jobs:
145157
context: ./
146158
platforms: linux/amd64,linux/arm64
147159
file: ./Dockerfile
148-
build-args: BRANCH=develop
160+
build-args: |
161+
BRANCH=develop
162+
GITHUB_USERNAME=${{ github.actor }}
163+
secrets: |
164+
github_token=${{ secrets.GITHUB_TOKEN }}
149165
builder: ${{ steps.buildx.outputs.name }}
150166
push: true
151167
sbom: true
@@ -165,6 +181,9 @@ jobs:
165181
build-args: |
166182
DISTRO_TAG=debug
167183
BRANCH=develop
184+
GITHUB_USERNAME=${{ github.actor }}
185+
secrets: |
186+
github_token=${{ secrets.GITHUB_TOKEN }}
168187
builder: ${{ steps.buildx.outputs.name }}
169188
push: true
170189
sbom: true
@@ -186,6 +205,9 @@ jobs:
186205
DISTRO_TAG=nonroot
187206
USR=nonroot:nonroot
188207
BRANCH=develop
208+
GITHUB_USERNAME=${{ github.actor }}
209+
secrets: |
210+
github_token=${{ secrets.GITHUB_TOKEN }}
189211
builder: ${{ steps.buildx.outputs.name }}
190212
push: true
191213
sbom: true
@@ -208,6 +230,9 @@ jobs:
208230
build-args: |
209231
FLAVOR=slim
210232
BRANCH=develop
233+
GITHUB_USERNAME=${{ github.actor }}
234+
secrets: |
235+
github_token=${{ secrets.GITHUB_TOKEN }}
211236
builder: ${{ steps.buildx.outputs.name }}
212237
push: true
213238
sbom: true
@@ -228,6 +253,9 @@ jobs:
228253
DISTRO_TAG=debug
229254
FLAVOR=slim
230255
BRANCH=develop
256+
GITHUB_USERNAME=${{ github.actor }}
257+
secrets: |
258+
github_token=${{ secrets.GITHUB_TOKEN }}
231259
builder: ${{ steps.buildx.outputs.name }}
232260
push: true
233261
sbom: true
@@ -250,6 +278,9 @@ jobs:
250278
FLAVOR=slim
251279
USR=nonroot:nonroot
252280
BRANCH=develop
281+
GITHUB_USERNAME=${{ github.actor }}
282+
secrets: |
283+
github_token=${{ secrets.GITHUB_TOKEN }}
253284
builder: ${{ steps.buildx.outputs.name }}
254285
push: true
255286
sbom: true

‎.github/workflows/ci-java8.yml‎

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ jobs:
4545
- name: Make buildkit default
4646
uses: docker/setup-buildx-action@v3
4747
id: buildx
48-
with:
49-
install: true
5048

5149
- name: Extract metadata
5250
id: meta
@@ -71,7 +69,11 @@ jobs:
7169
uses: docker/build-push-action@v6
7270
with:
7371
context: .
74-
build-args: BRANCH=master
72+
build-args: |
73+
BRANCH=master
74+
GITHUB_USERNAME=${{ github.actor }}
75+
secrets: |
76+
github_token=${{ secrets.GITHUB_TOKEN }}
7577
file: ./Dockerfile_j8
7678
load: true
7779
tags: ${{ env.TEST_TAG }}
@@ -84,6 +86,9 @@ jobs:
8486
build-args: |
8587
DISTRO_TAG=debug
8688
BRANCH=master
89+
GITHUB_USERNAME=${{ github.actor }}
90+
secrets: |
91+
github_token=${{ secrets.GITHUB_TOKEN }}
8792
file: ./Dockerfile_j8
8893
load: true
8994
tags: ${{ env.TEST_TAG }}-debug
@@ -97,6 +102,9 @@ jobs:
97102
BRANCH=master
98103
DISTRO_TAG=nonroot
99104
USR=nonroot:nonroot
105+
GITHUB_USERNAME=${{ github.actor }}
106+
secrets: |
107+
github_token=${{ secrets.GITHUB_TOKEN }}
100108
file: ./Dockerfile_j8
101109
load: true
102110
tags: ${{ env.TEST_TAG }}-nonroot
@@ -110,6 +118,9 @@ jobs:
110118
DISTRO_TAG=debug
111119
FLAVOR=slim
112120
BRANCH=master
121+
GITHUB_USERNAME=${{ github.actor }}
122+
secrets: |
123+
github_token=${{ secrets.GITHUB_TOKEN }}
113124
file: ./Dockerfile_j8
114125
load: true
115126
tags: ${{ env.TEST_TAG }}-debug-slim
@@ -123,7 +134,7 @@ jobs:
123134
sleep 35s
124135
125136
- name: Run tests
126-
run: bats --tap test/bats/*.bats
137+
run: bats --tap test/bats/0*.bats
127138

128139
# DP: This is dynamically setting Version number of latest
129140
- name: Get SemVer string from test image
@@ -141,7 +152,11 @@ jobs:
141152
context: ./
142153
platforms: linux/amd64,linux/arm64
143154
file: ./Dockerfile_j8
144-
build-args: BRANCH=master
155+
build-args: |
156+
BRANCH=master
157+
GITHUB_USERNAME=${{ github.actor }}
158+
secrets: |
159+
github_token=${{ secrets.GITHUB_TOKEN }}
145160
builder: ${{ steps.buildx.outputs.name }}
146161
push: true
147162
sbom: true
@@ -162,6 +177,9 @@ jobs:
162177
build-args: |
163178
DISTRO_TAG=debug
164179
BRANCH=master
180+
GITHUB_USERNAME=${{ github.actor }}
181+
secrets: |
182+
github_token=${{ secrets.GITHUB_TOKEN }}
165183
builder: ${{ steps.buildx.outputs.name }}
166184
push: true
167185
sbom: true
@@ -183,6 +201,9 @@ jobs:
183201
DISTRO_TAG=nonroot
184202
USR=nonroot:nonroot
185203
BRANCH=master
204+
GITHUB_USERNAME=${{ github.actor }}
205+
secrets: |
206+
github_token=${{ secrets.GITHUB_TOKEN }}
186207
builder: ${{ steps.buildx.outputs.name }}
187208
push: true
188209
sbom: true
@@ -205,6 +226,9 @@ jobs:
205226
build-args: |
206227
FLAVOR=slim
207228
BRANCH=master
229+
GITHUB_USERNAME=${{ github.actor }}
230+
secrets: |
231+
github_token=${{ secrets.GITHUB_TOKEN }}
208232
builder: ${{ steps.buildx.outputs.name }}
209233
push: true
210234
sbom: true
@@ -226,6 +250,9 @@ jobs:
226250
DISTRO_TAG=debug
227251
FLAVOR=slim
228252
BRANCH=master
253+
GITHUB_USERNAME=${{ github.actor }}
254+
secrets: |
255+
github_token=${{ secrets.GITHUB_TOKEN }}
229256
builder: ${{ steps.buildx.outputs.name }}
230257
push: true
231258
sbom: true
@@ -248,6 +275,9 @@ jobs:
248275
FLAVOR=slim
249276
USR=nonroot:nonroot
250277
BRANCH=master
278+
GITHUB_USERNAME=${{ github.actor }}
279+
secrets: |
280+
github_token=${{ secrets.GITHUB_TOKEN }}
251281
builder: ${{ steps.buildx.outputs.name }}
252282
push: true
253283
sbom: true

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ target/
4444
dump/*
4545
!dump/exist-distribution-*/
4646

47+
reports/*
48+
4749
# Copied files from test runs
4850
/conf.xml
4951
/conf.xml.bak
5052

53+
# GitHub token file (local builds)
54+
.github_token

0 commit comments

Comments
 (0)