Skip to content

Commit 011dc54

Browse files
committed
correct versions for rel-13 code line
1 parent 3ce13e3 commit 011dc54

2 files changed

Lines changed: 11 additions & 12 deletions

File tree

circleci/images/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ PG_VERSIONS=$(shell cat PG_VERSIONS|cut -c 6-|tr '\n' ' ' )
1414

1515
PG_UPGRADE_TESTER_VERSION=$(shell echo ${PG_VERSIONS}|tr ' ' '-'|sed 's/~//g')
1616

17-
STYLE_CHECKER_TOOLS_VERSION=0.8.33
17+
STYLE_CHECKER_TOOLS_VERSION=0.8.18
1818

1919
# Upgrade tests for the PG major versions from PG_VERSIONS file
2020
CITUS_UPGRADE_PG_VERSIONS=$(shell head -n2 PG_VERSIONS|cut -c 6-|tr '\n' ' ')
2121

22-
CITUS_UPGRADE_VERSIONS_15=v12.1.10
22+
CITUS_UPGRADE_VERSIONS_15=v12.1.11
2323
# 12.1.10 is the latest release of Citus 12 when the test is expanded to cover Citus 12
24-
CITUS_UPGRADE_VERSIONS_16=v12.1.10
24+
CITUS_UPGRADE_VERSIONS_16=v12.1.11
2525
# Latest minor version of Citus 13
26-
CITUS_UPGRADE_VERSIONS_17=v13.2.0
26+
CITUS_UPGRADE_VERSIONS_17=v13.2.1
2727

2828
# Function to get Citus versions for a specific PG major version
2929
get_citus_versions = $(CITUS_UPGRADE_VERSIONS_$(1))

circleci/images/stylechecker/Dockerfile

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# we cannot easily upgrade to python 3.11 as our mitmproxy fork does not ship with it
2-
FROM alpine:latest
1+
FROM alpine:3.22
32
ARG TOOLS_VERSION
43

54
COPY ./files/etc/requirements.txt /tmp/etc/
@@ -18,7 +17,7 @@ apk add --no-cache --virtual installdeps \
1817
musl-dev \
1918
py3-pip \
2019
python3-dev \
21-
tar \
20+
tar
2221

2322
apk add --no-cache \
2423
ca-certificates \
@@ -28,23 +27,23 @@ apk add --no-cache \
2827
openssh \
2928
perl \
3029
python3 \
31-
py3-packaging \
30+
py3-packaging
3231

33-
curl -L "https://github.com/citusdata/tools/archive/v${TOOLS_VERSION}.tar.gz" | tar xz
32+
curl -fsSL "https://codeload.github.com/citusdata/tools/tar.gz/v${TOOLS_VERSION}" | tar xz
3433
cd "tools-${TOOLS_VERSION}"
3534
make uncrustify/.install
3635
cd ..
3736
rm -rf "v${TOOLS_VERSION}.tar.gz"
3837

39-
curl -L "https://github.com/uncrustify/uncrustify/archive/uncrustify-0.82.0.tar.gz" | tar xz
40-
cd uncrustify-uncrustify-0.82.0/
38+
curl -fsSL "https://codeload.github.com/uncrustify/uncrustify/tar.gz/uncrustify-0.68.1" | tar xz
39+
cd uncrustify-uncrustify-0.68.1/
4140
mkdir build
4241
cd build
4342
cmake ..
4443
make -j5
4544
make install
4645
cd ../..
47-
rm -rf uncrustify-uncrustify-0.82.0/
46+
rm -rf uncrustify-uncrustify-0.68.1/
4847

4948
# this image is only used for testing purposes, so should be okay to overwrite system-managed packages
5049
pip3 install -Ir /tmp/etc/requirements.txt --break-system-packages

0 commit comments

Comments
 (0)