Skip to content

Commit 10265f1

Browse files
authored
fix: rollback to python 3.13 (#7269)
- rollback to python 3.13 to fix cfn-lint runtime errors - add npm-groovy-lint to the npm dependabot group - fix clang-format stage build errors after updating to alpine 3.23 - explicitly cache the python-base stage to avoid that stages use an old cached version of that stage
1 parent c6a7b38 commit 10265f1

4 files changed

Lines changed: 7 additions & 4 deletions

File tree

.github/dependabot.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ updates:
5353
- "commitlint"
5454
- "eslint-config*"
5555
- "eslint-plugin*"
56+
- npm-groovy-lint
5657
- "react*"
5758
- "stylelint*"
5859
- "textlint*"

.github/workflows/cd.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
stages:
26+
- stage-name: python-base
2627
- stage-name: base_image
2728
- stage-name: clang-format
2829
- stage-name: python-builder

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ jobs:
8888
fail-fast: false
8989
matrix:
9090
stages:
91+
- stage-name: python-base
9192
- stage-name: base_image
9293
- stage-name: clang-format
9394
- stage-name: python-builder

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,21 @@ FROM composer/composer:2.9.1 AS php-composer
3232
FROM ghcr.io/aquasecurity/trivy:0.67.2 AS trivy
3333
FROM ghcr.io/yannh/kubeconform:v0.7.0 AS kubeconform
3434

35-
FROM python:3.14.0-alpine3.22 AS python-base
35+
FROM python:3.13.11-alpine3.23 AS python-base
3636

3737
FROM python-base AS clang-format
3838

3939
RUN apk add --no-cache \
4040
build-base \
41-
clang20 \
41+
clang21 \
4242
cmake \
4343
git \
44-
llvm20-dev \
44+
llvm21-dev \
4545
ninja-is-really-ninja
4646

4747
WORKDIR /tmp
4848
RUN git clone \
49-
--branch "llvmorg-$(llvm-config --version)" \
49+
--branch "llvmorg-$(llvm21-config --version)" \
5050
--depth 1 \
5151
https://github.com/llvm/llvm-project.git
5252

0 commit comments

Comments
 (0)