Skip to content

Commit 0d828db

Browse files
committed
Revert "Update protobuf-cpp to 31.1"
This reverts commit 65b3f28.
1 parent 65b3f28 commit 0d828db

File tree

4 files changed

+107977
-141848
lines changed

4 files changed

+107977
-141848
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,20 @@ jobs:
2020
id: cache-protobuf
2121
uses: actions/cache@v4
2222
with:
23-
path: protobuf-31.1
24-
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.valgrind }}-protobuf-31.1
23+
path: protobuf-25.1
24+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.valgrind }}-protobuf-25.1
2525
- name: Build protobuf library
2626
if: matrix.protobuf_lib == 'protobuf-cpp' && steps.cache-protobuf.outputs.cache-hit != 'true'
2727
run: |
28-
git clone --depth 1 --branch v31.1 https://github.com/protocolbuffers/protobuf.git protobuf-31.1
29-
cd protobuf-31.1
28+
git clone --depth 1 --branch v25.1 https://github.com/protocolbuffers/protobuf.git protobuf-25.1
29+
cd protobuf-25.1
30+
git submodule update --init --recursive
3031
cmake .
3132
cmake --build . --parallel 10
3233
- name: Install protobuf library
3334
if: matrix.protobuf_lib == 'protobuf-cpp'
3435
run: |
35-
cd protobuf-31.1
36+
cd protobuf-25.1
3637
sudo make install
3738
sudo ldconfig
3839
- name: Install Valgrind

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ PG_VERSION = 17.4
1111
PG_VERSION_MAJOR = $(call word-dot,$(PG_VERSION),1)
1212
PG_VERSION_NUM = 170004
1313
PG_BRANCH = REL_17_STABLE
14-
PROTOC_VERSION = 31.1
14+
PROTOC_VERSION = 25.1
1515

1616
VERSION = 6.1.0
1717
VERSION_MAJOR = $(call word-dot,$(VERSION),1)

0 commit comments

Comments
 (0)