Skip to content

Commit e4d3aa0

Browse files
authored
Upgrade uncrustify to fix stylechecker images (#179)
Upgrades uncrustify to 0.82.0 (see below), downgrades pg versions since we will bump versions in Citus _after_ we fix style images. Getting the following error with uncrustify 0.68.1: ``` + cmake .. CMake Error at CMakeLists.txt:1 (cmake_minimum_required): Compatibility with CMake < 3.5 has been removed from CMake. ``` Fix: 0.78.0 is the oldest version with cmake_minimum_required(VERSION 3.5). However, I suggest going with the newest version of uncrustify, 0.82.0, since were gonna update all things anyway, might as well use the newest version. Sister PRs citusdata/citus#8373 citusdata/tools#382
1 parent 24bb0ba commit e4d3aa0

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

circleci/images/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ 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.18
17+
STYLE_CHECKER_TOOLS_VERSION=0.8.33
1818

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

circleci/images/PG_VERSIONS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
PG15=15.15
2-
PG16=16.11
3-
PG17=17.7
1+
PG15=15.14
2+
PG16=16.10
3+
PG17=17.6

circleci/images/stylechecker/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ make uncrustify/.install
3636
cd ..
3737
rm -rf "v${TOOLS_VERSION}.tar.gz"
3838

39-
curl -L "https://github.com/uncrustify/uncrustify/archive/uncrustify-0.68.1.tar.gz" | tar xz
40-
cd uncrustify-uncrustify-0.68.1/
39+
curl -L "https://github.com/uncrustify/uncrustify/archive/uncrustify-0.82.0.tar.gz" | tar xz
40+
cd uncrustify-uncrustify-0.82.0/
4141
mkdir build
4242
cd build
4343
cmake ..
4444
make -j5
4545
make install
4646
cd ../..
47-
rm -rf uncrustify-uncrustify-0.68.1/
47+
rm -rf uncrustify-uncrustify-0.82.0/
4848

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

0 commit comments

Comments
 (0)