Skip to content

Commit 171f95f

Browse files
Merge branch 'main' into renovate/buildpack-deps-jammy
2 parents babc1dd + 2b7d493 commit 171f95f

7 files changed

Lines changed: 11 additions & 11 deletions

File tree

chunks/lang-java/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN curl -fsSL "https://get.sdkman.io" | bash \
1313
&& sed -i 's/sdkman_selfupdate_enable=true/sdkman_selfupdate_enable=false/g' /home/gitpod/.sdkman/etc/config \
1414
&& sed -i 's/sdkman_selfupdate_feature=true/sdkman_selfupdate_feature=false/g' /home/gitpod/.sdkman/etc/config \
1515
&& sdk install java ${JAVA_VERSION} \
16-
&& sdk install java 17.0.14.fx-zulu \
16+
&& sdk install java 17.0.15.fx-zulu \
1717
&& sdk default java ${JAVA_VERSION} \
1818
&& sdk install gradle \
1919
# 4.x requires Java 17+ https://maven.apache.org/docs/history.html

chunks/lang-java/chunk.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
variants:
22
- name: "11"
33
args:
4-
JAVA_VERSION: 11.0.26.fx-zulu
4+
JAVA_VERSION: 11.0.27.fx-zulu
55
- name: "17"
66
args:
7-
JAVA_VERSION: 17.0.14.fx-zulu
7+
JAVA_VERSION: 17.0.15.fx-zulu
88
- name: "21"
99
args:
10-
JAVA_VERSION: 21.0.6.fx-zulu
10+
JAVA_VERSION: 21.0.7.fx-zulu
1111
- name: "23"
1212
args:
1313
JAVA_VERSION: 23.0.2.fx-zulu

chunks/lang-python/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ RUN sudo install-packages \
2121
libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev \
2222
# Install PYENV
2323
&& git clone https://github.com/pyenv/pyenv.git ~/.pyenv \
24-
# v2.4.16
25-
&& git -C ~/.pyenv checkout b3dad5887e1daef68a73360546082ad4eb4b82b8 \
24+
# v2.5.5
25+
&& git -C ~/.pyenv checkout 97993fcc26999fb9f9d2172afd6914738df274d8 \
2626
&& pyenv install ${PYTHON_VERSION} \
2727
&& pyenv global ${PYTHON_VERSION} \
2828
&& for exec in global; do printf '%s\n' 'source "$HOME/.gp_pyenv.d/userbase.bash"' >> "$PYENV_ROOT/libexec/pyenv-$exec"; done \

chunks/tool-brew/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ USER gitpod
66
# Dazzle does not rebuild a layer until one of its lines are changed. Increase this counter to rebuild this layer.
77
# Note that us using the actual desired version does not enforce it, it merely serves as a stamp
88
# for what the latest version was when we last rebuilt the layer
9-
ENV TRIGGER_REBUILD="4.4.32"
9+
ENV TRIGGER_REBUILD="4.5.1"
1010

1111
RUN mkdir ~/.cache && /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
1212
ENV PATH=/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin/:$PATH

chunks/tool-bun/chunk.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
variants:
22
- name: "1"
33
args:
4-
BUN_VERSION: 1.2.10
4+
BUN_VERSION: 1.2.12

chunks/tool-yugabytedb/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ RUN curl -sSLo ./yugabyte.tar.gz https://downloads.yugabyte.com/releases/${YB_VE
3030
ENV PATH="$HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH"
3131
ENV PYENV_ROOT="$HOME/.pyenv"
3232
RUN git clone https://github.com/pyenv/pyenv.git ~/.pyenv \
33-
# v2.4.16
34-
&& git -C ~/.pyenv checkout b3dad5887e1daef68a73360546082ad4eb4b82b8 \
33+
# v2.5.5
34+
&& git -C ~/.pyenv checkout 97993fcc26999fb9f9d2172afd6914738df274d8 \
3535
&& pyenv install ${PYTHON_VERSION} \
3636
&& pyenv global ${PYTHON_VERSION}
3737

tests/lang-java.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
stderr.indexOf("23.0.") != -1
1111
- desc: it should have a functioning java 17 installed
1212
entrypoint: [env, GITPOD_REPO_ROOT=/workspace, bash, -ci]
13-
command: [sdk default java 17.0.14.fx-zulu && java -version && mvn -v]
13+
command: [sdk default java 17.0.15.fx-zulu && java -version && mvn -v]
1414
assert:
1515
- status == 0
1616
- stderr.indexOf('openjdk version \"17.') != -1

0 commit comments

Comments
 (0)