Skip to content

Commit d8170fe

Browse files
Merge branch 'actions:main' into main
2 parents ac8a1fd + 25f376e commit d8170fe

Some content is hidden

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

43 files changed

+28100
-3193
lines changed

.github/dependabot.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
5+
6+
version: 2
7+
updates:
8+
# Enable version updates for npm
9+
- package-ecosystem: 'npm'
10+
# Look for `package.json` and `lock` files in the `root` directory
11+
directory: '/'
12+
# Check the npm registry for updates every day (weekdays)
13+
schedule:
14+
interval: 'weekly'
15+
16+
# Enable version updates for GitHub Actions
17+
- package-ecosystem: 'github-actions'
18+
# Workflow files stored in the default location of `.github/workflows`
19+
# You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.
20+
directory: '/'
21+
schedule:
22+
interval: 'weekly'

.github/workflows/e2e-cache.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
strategy:
123123
fail-fast: false
124124
matrix:
125-
os: [macos-13, windows-latest, ubuntu-latest]
125+
os: [macos-13, windows-latest, ubuntu-22.04]
126126
steps:
127127
- name: Checkout
128128
uses: actions/checkout@v4
@@ -171,7 +171,7 @@ jobs:
171171
strategy:
172172
fail-fast: false
173173
matrix:
174-
os: [macos-13, windows-latest, ubuntu-latest]
174+
os: [macos-13, windows-latest, ubuntu-22.04]
175175
needs: sbt-save
176176
steps:
177177
- name: Checkout

.github/workflows/e2e-versions.yml

Lines changed: 78 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ jobs:
3131
'semeru',
3232
'corretto',
3333
'dragonwell',
34-
'sapmachine'
34+
'sapmachine',
35+
'jetbrains'
3536
] # internally 'adopt-hotspot' is the same as 'adopt'
3637
version: ['21', '11', '17']
3738
exclude:
@@ -70,6 +71,8 @@ jobs:
7071
with:
7172
java-version: ${{ matrix.version }}
7273
distribution: ${{ matrix.distribution }}
74+
env:
75+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7376
- name: Verify Java
7477
run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
7578
shell: bash
@@ -103,6 +106,12 @@ jobs:
103106
- distribution: sapmachine
104107
os: ubuntu-latest
105108
version: '17.0.7'
109+
- distribution: jetbrains
110+
os: ubuntu-latest
111+
version: '11.0.11'
112+
- distribution: jetbrains
113+
os: ubuntu-latest
114+
version: '17.0.7'
106115
steps:
107116
- name: Checkout
108117
uses: actions/checkout@v4
@@ -115,6 +124,8 @@ jobs:
115124
- name: Verify Java
116125
run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
117126
shell: bash
127+
env:
128+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
118129

119130
setup-java-check-latest:
120131
name: ${{ matrix.distribution }} ${{ matrix.version }} - check-latest flag - ${{ matrix.os }}
@@ -125,7 +136,14 @@ jobs:
125136
matrix:
126137
os: [macos-latest, windows-latest, ubuntu-latest]
127138
distribution:
128-
['temurin', 'zulu', 'liberica', 'dragonwell', 'sapmachine']
139+
[
140+
'temurin',
141+
'zulu',
142+
'liberica',
143+
'dragonwell',
144+
'sapmachine',
145+
'jetbrains'
146+
]
129147
exclude:
130148
- distribution: dragonwell
131149
os: macos-latest
@@ -139,6 +157,8 @@ jobs:
139157
distribution: ${{ matrix.distribution }}
140158
java-version: 11
141159
check-latest: true
160+
env:
161+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
142162
- name: Verify Java
143163
run: bash __tests__/verify-java.sh "11" "${{ steps.setup-java.outputs.path }}"
144164
shell: bash
@@ -152,7 +172,14 @@ jobs:
152172
matrix:
153173
os: [macos-latest, windows-latest, ubuntu-latest]
154174
distribution:
155-
['temurin', 'zulu', 'liberica', 'dragonwell', 'sapmachine']
175+
[
176+
'temurin',
177+
'zulu',
178+
'liberica',
179+
'dragonwell',
180+
'sapmachine',
181+
'jetbrains'
182+
]
156183
exclude:
157184
- distribution: dragonwell
158185
os: macos-latest
@@ -167,6 +194,8 @@ jobs:
167194
java-version: |
168195
11
169196
17
197+
env:
198+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
170199
- name: Verify Java env variables
171200
run: |
172201
$versionsArr = "11","17"
@@ -258,7 +287,8 @@ jobs:
258287
fail-fast: false
259288
matrix:
260289
os: [macos-13, windows-latest, ubuntu-latest]
261-
distribution: ['temurin', 'zulu', 'liberica', 'semeru', 'sapmachine']
290+
distribution:
291+
['temurin', 'zulu', 'liberica', 'semeru', 'sapmachine', 'jetbrains']
262292
java-package: ['jre']
263293
version: ['17.0']
264294
include:
@@ -282,6 +312,47 @@ jobs:
282312
java-package: jre
283313
version: '8'
284314
os: windows-latest
315+
- distribution: 'jetbrains'
316+
java-package: jdk+jcef
317+
version: '11'
318+
os: ubuntu-latest
319+
- distribution: 'jetbrains'
320+
java-package: jdk+jcef
321+
version: '17'
322+
os: ubuntu-latest
323+
- distribution: 'jetbrains'
324+
java-package: jdk+jcef
325+
version: '21'
326+
os: ubuntu-latest
327+
- distribution: 'jetbrains'
328+
java-package: jre+jcef
329+
version: '11'
330+
os: ubuntu-latest
331+
- distribution: 'jetbrains'
332+
java-package: jre+jcef
333+
version: '17'
334+
os: ubuntu-latest
335+
- distribution: 'jetbrains'
336+
java-package: jre+jcef
337+
version: '21'
338+
os: ubuntu-latest
339+
- distribution: 'jetbrains'
340+
java-package: jdk+ft
341+
version: '17'
342+
os: ubuntu-latest
343+
- distribution: 'jetbrains'
344+
java-package: jdk+ft
345+
version: '21'
346+
os: ubuntu-latest
347+
- distribution: 'jetbrains'
348+
java-package: jre+ft
349+
version: '17'
350+
os: ubuntu-latest
351+
- distribution: 'jetbrains'
352+
java-package: jre+ft
353+
version: '21'
354+
os: ubuntu-latest
355+
285356
steps:
286357
- name: Checkout
287358
uses: actions/checkout@v4
@@ -292,6 +363,8 @@ jobs:
292363
java-version: ${{ matrix.version }}
293364
java-package: ${{ matrix.java-package }}
294365
distribution: ${{ matrix.distribution }}
366+
env:
367+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
295368
- name: Verify Java
296369
run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
297370
shell: bash
@@ -305,7 +378,7 @@ jobs:
305378
fail-fast: false
306379
matrix:
307380
# x86 is not supported on macOS
308-
os: [windows-latest, ubuntu-latest]
381+
os: [windows-latest, ubuntu-22.04]
309382
distribution: ['liberica', 'zulu', 'corretto']
310383
version: ['11']
311384
steps:

.github/workflows/publish-immutable-actions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
uses: actions/checkout@v4
1818
- name: Publish
1919
id: publish
20-
uses: actions/publish-immutable-action@0.0.3
20+
uses: actions/publish-immutable-action@v0.0.4

.licenses/npm/@actions/cache.dep.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.licenses/npm/@actions/core.dep.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.licenses/npm/@actions/http-client.dep.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.licenses/npm/@protobuf-ts/plugin-framework.dep.yml

Lines changed: 160 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)