Skip to content

Commit 5844f04

Browse files
authored
Merge branch 'master' into dependency-track-tags-support
Signed-off-by: gschafra <[email protected]>
2 parents a926aa6 + a876d42 commit 5844f04

28 files changed

+191
-90
lines changed

.github/workflows/binary-builds.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ jobs:
4848
arch: [ amd64, arm64]
4949
libc: [ gnu, musl ]
5050
exclude:
51-
# No more intel on macos
52-
- os: darwin
53-
arch: amd64
5451
# musl can only be built on linux
5552
- os: darwin
5653
libc: musl
5754
- os: windows
5855
libc: musl
5956
include:
6057
# Set all the runners
58+
- os: darwin
59+
arch: amd64
60+
runner: macos-14-large
6161
- os: darwin
6262
arch: arm64
6363
runner: macos-14

.github/workflows/build-images.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,9 @@ jobs:
183183

184184
- lang: python313
185185

186+
- lang: python313
187+
distro: alpine
188+
186189
- lang: ruby25
187190
fix-qemu: true
188191
skip-arm: true

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24.10.0
1+
24.11.0

.versions/node_24

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# renovate: datasource=node-version depName=node
2-
24.10.0
2+
24.11.0

.versions/node_25

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# renovate: datasource=node-version depName=node
2-
25.0.0
2+
25.1.0

biome.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://biomejs.dev/schemas/2.3.2/schema.json",
2+
"$schema": "https://biomejs.dev/schemas/2.3.3/schema.json",
33
"assist": {
44
"actions": {
55
"source": {

ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ARG GRADLE_VERSION=8.14.3
1414
# renovate: datasource=golang-version depName=golang
1515
ARG GO_VERSION=1.25.3
1616
# renovate: datasource=node-version depName=node
17-
ARG NODE_VERSION=24.10.0
17+
ARG NODE_VERSION=24.11.0
1818
ARG RUBY_VERSION=3.4.5
1919
ARG JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
2020
ARG SCALA_VERSION=3.7.2

ci/images/Dockerfile.dotnet8

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Base-image
2-
FROM registry.suse.com/bci/dotnet-sdk:8.0.21@sha256:fd9ddda0ed8a4c2435b4a26529eeea1c55755f79fb84689ddf91b227210dfe5e AS base
2+
FROM registry.suse.com/bci/dotnet-sdk:8.0.21@sha256:7318a8ce154c8e93d9fae24ee8129ad14368e396de738afe5647a7aa1177c1ea AS base
33

44
ARG GITHUB_URL=https://github.com
55
ARG NODEJS_DIST_URL
@@ -40,6 +40,7 @@ RUN set -e; \
4040
&& zypper \
4141
--non-interactive \
4242
update \
43+
&& zypper addlock mssql-zulu-jre-8 \
4344
&& zypper \
4445
--non-interactive \
4546
install \

ci/images/Dockerfile.dotnet9

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Base-image
2-
FROM registry.suse.com/bci/dotnet-sdk:9.0.10@sha256:25e481dcc98f1df3e94d639f48165335d9d305a612c1a221e3dca21c3cea1a96 AS base
2+
FROM registry.suse.com/bci/dotnet-sdk:9.0.10@sha256:0630dc3fc8272c6a6880f1952a15c68bd3555cb998c7e4cb055c542fac42b33a AS base
33

44
ARG NODEJS_DIST_URL
55
ARG NPM_REPO
@@ -39,6 +39,7 @@ RUN set -e; \
3939
&& zypper \
4040
--non-interactive \
4141
update \
42+
&& zypper addlock mssql-zulu-jre-8 \
4243
&& zypper \
4344
--non-interactive \
4445
install \

ci/images/Dockerfile.java17

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Base-image
2-
FROM registry.suse.com/bci/openjdk-devel:17.0.16.0@sha256:596ac8eb4c7a65bff3efd75bdd7c7e0fea5f8186accd5d81db0f67b052a12969 AS base
2+
FROM registry.suse.com/bci/openjdk-devel:17.0.16.0@sha256:6dc2d83b89849b5f590be104e798f2488804d7c61aeac79d05cdae5f75e503e2 AS base
33

44
ARG GITHUB_URL=https://github.com
55
ARG GRADLE_8

0 commit comments

Comments
 (0)