Skip to content

Commit ff0b7c4

Browse files
nikhilsinhaparseablenikhilsinhaparseable
authored
Merge branch 'main' into add-sysinfo-metrics
2 parents 6d67039 + 01d4449 commit ff0b7c4

File tree

18 files changed

+1648
-726
lines changed

18 files changed

+1648
-726
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 50 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
name: Ensure parseable builds on all release targets
2-
32
on:
43
pull_request:
54
paths-ignore:
6-
- "docs/**"
7-
- "helm/**"
8-
- "assets/**"
5+
- docs/**
6+
- helm/**
7+
- assets/**
98
- "**.md"
10-
119
jobs:
1210
# Default build without Kafka
1311
build-default:
@@ -30,15 +28,12 @@ jobs:
3028
# Windows build
3129
- os: windows-latest
3230
target: x86_64-pc-windows-msvc
33-
3431
steps:
3532
- uses: actions/checkout@v4
36-
3733
- name: Setup Rust toolchain
3834
uses: dtolnay/rust-toolchain@stable
3935
with:
4036
targets: ${{ matrix.target }}
41-
4237
- name: Cache dependencies
4338
uses: actions/cache@v4
4439
with:
@@ -47,14 +42,12 @@ jobs:
4742
~/.cargo/git
4843
target
4944
key: ${{ runner.os }}-cargo-${{ matrix.target }}-default-${{ hashFiles('**/Cargo.lock') }}
50-
5145
- name: Build
5246
uses: actions-rs/cargo@v1
5347
with:
5448
use-cross: ${{ runner.os == 'Linux' }}
5549
command: build
5650
args: --target ${{ matrix.target }} --release
57-
5851
# Kafka build for supported platforms
5952
build-kafka:
6053
name: Build Kafka ${{matrix.target}}
@@ -68,10 +61,8 @@ jobs:
6861
target: x86_64-unknown-linux-gnu
6962
- os: macos-latest
7063
target: aarch64-apple-darwin
71-
7264
steps:
7365
- uses: actions/checkout@v4
74-
7566
# Linux-specific dependencies
7667
- name: Install Linux dependencies
7768
if: runner.os == 'Linux'
@@ -90,7 +81,6 @@ jobs:
9081
python3 \
9182
gcc-aarch64-linux-gnu \
9283
g++-aarch64-linux-gnu
93-
9484
# Install cross-compilation specific packages
9585
if [ "${{ matrix.target }}" = "aarch64-unknown-linux-gnu" ]; then
9686
sudo apt-get install -y \
@@ -101,8 +91,6 @@ jobs:
10191
libssl-dev:arm64 \
10292
pkg-config-aarch64-linux-gnu
10393
fi
104-
105-
10694
# macOS-specific dependencies
10795
- name: Install macOS dependencies
10896
if: runner.os == 'macOS'
@@ -116,12 +104,10 @@ jobs:
116104
openssl@3.0 \
117105
cyrus-sasl \
118106
python3
119-
120107
- name: Setup Rust toolchain
121108
uses: dtolnay/rust-toolchain@stable
122109
with:
123110
targets: ${{ matrix.target }}
124-
125111
- name: Cache dependencies
126112
uses: actions/cache@v4
127113
with:
@@ -130,7 +116,48 @@ jobs:
130116
~/.cargo/git
131117
target
132118
key: ${{ runner.os }}-cargo-${{ matrix.target }}-kafka-${{ hashFiles('**/Cargo.lock') }}
133-
119+
- name: Find and fix librdkafka CMakeLists.txt for Linux
120+
if: runner.os == 'Linux'
121+
run: |
122+
cargo fetch
123+
# Find the rdkafka-sys package directory
124+
RDKAFKA_SYS_DIR=$(find ~/.cargo/registry/src -name "rdkafka-sys-*" -type d | head -n 1)
125+
echo "Found rdkafka-sys at: $RDKAFKA_SYS_DIR"
126+
# Find the librdkafka CMakeLists.txt file
127+
CMAKE_FILE="$RDKAFKA_SYS_DIR/librdkafka/CMakeLists.txt"
128+
if [ -f "$CMAKE_FILE" ]; then
129+
echo "Found CMakeLists.txt at: $CMAKE_FILE"
130+
# Make a backup of the original file
131+
cp "$CMAKE_FILE" "$CMAKE_FILE.bak"
132+
# Replace the minimum required version
133+
sed -i 's/cmake_minimum_required(VERSION 3.2)/cmake_minimum_required(VERSION 3.5)/' "$CMAKE_FILE"
134+
echo "Modified CMakeLists.txt - before and after comparison:"
135+
diff "$CMAKE_FILE.bak" "$CMAKE_FILE" || true
136+
else
137+
echo "Could not find librdkafka CMakeLists.txt file!"
138+
exit 1
139+
fi
140+
- name: Find and fix librdkafka CMakeLists.txt for macOS
141+
if: runner.os == 'macOS'
142+
run: |
143+
cargo fetch
144+
# Find the rdkafka-sys package directory
145+
RDKAFKA_SYS_DIR=$(find ~/.cargo/registry/src -name "rdkafka-sys-*" -type d | head -n 1)
146+
echo "Found rdkafka-sys at: $RDKAFKA_SYS_DIR"
147+
# Find the librdkafka CMakeLists.txt file
148+
CMAKE_FILE="$RDKAFKA_SYS_DIR/librdkafka/CMakeLists.txt"
149+
if [ -f "$CMAKE_FILE" ]; then
150+
echo "Found CMakeLists.txt at: $CMAKE_FILE"
151+
# Make a backup of the original file
152+
cp "$CMAKE_FILE" "$CMAKE_FILE.bak"
153+
# Replace the minimum required version - macOS requires '' after -i
154+
sed -i '' 's/cmake_minimum_required(VERSION 3.2)/cmake_minimum_required(VERSION 3.5)/' "$CMAKE_FILE"
155+
echo "Modified CMakeLists.txt - before and after comparison:"
156+
diff "$CMAKE_FILE.bak" "$CMAKE_FILE" || true
157+
else
158+
echo "Could not find librdkafka CMakeLists.txt file!"
159+
exit 1
160+
fi
134161
- name: Build with Kafka
135162
uses: actions-rs/cargo@v1
136163
with:
@@ -140,9 +167,9 @@ jobs:
140167
env:
141168
LIBRDKAFKA_SSL_VENDORED: 1
142169
PKG_CONFIG_ALLOW_CROSS: "1"
143-
PKG_CONFIG_PATH: "/usr/lib/aarch64-linux-gnu/pkgconfig"
144-
SASL2_DIR: "/usr/lib/aarch64-linux-gnu"
145-
OPENSSL_DIR: "/usr/lib/aarch64-linux-gnu"
146-
OPENSSL_ROOT_DIR: "/usr/lib/aarch64-linux-gnu"
170+
PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
171+
SASL2_DIR: /usr/lib/aarch64-linux-gnu
172+
OPENSSL_DIR: /usr/lib/aarch64-linux-gnu
173+
OPENSSL_ROOT_DIR: /usr/lib/aarch64-linux-gnu
147174
OPENSSL_STATIC: "1"
148-
SASL2_STATIC: "0"
175+
SASL2_STATIC: "0"

‎.github/workflows/coverage.yaml‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -62,34 +62,6 @@ jobs:
6262
exit 1
6363
fi
6464
65-
- name: Find and fix librdkafka CMakeLists.txt
66-
run: |
67-
# Download the package first so it's in the registry
68-
cargo fetch
69-
70-
# Find the rdkafka-sys package directory
71-
RDKAFKA_SYS_DIR=$(find ~/.cargo/registry/src -name "rdkafka-sys-*" -type d | head -n 1)
72-
echo "Found rdkafka-sys at: $RDKAFKA_SYS_DIR"
73-
74-
# Find the librdkafka CMakeLists.txt file
75-
CMAKE_FILE="$RDKAFKA_SYS_DIR/librdkafka/CMakeLists.txt"
76-
77-
if [ -f "$CMAKE_FILE" ]; then
78-
echo "Found CMakeLists.txt at: $CMAKE_FILE"
79-
80-
# Make a backup of the original file
81-
cp "$CMAKE_FILE" "$CMAKE_FILE.bak"
82-
83-
# Replace the minimum required version
84-
sed -i 's/cmake_minimum_required(VERSION 3.2)/cmake_minimum_required(VERSION 3.5)/' "$CMAKE_FILE"
85-
86-
echo "Modified CMakeLists.txt - before and after comparison:"
87-
diff "$CMAKE_FILE.bak" "$CMAKE_FILE" || true
88-
else
89-
echo "Could not find librdkafka CMakeLists.txt file!"
90-
exit 1
91-
fi
92-
9365
- name: Check with clippy
9466
run: cargo hack clippy --verbose --each-feature --no-dev-deps -- -D warnings
9567

‎Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "parseable"
3-
version = "2.1.0"
3+
version = "2.2.0"
44
authors = ["Parseable Team <hi@parseable.com>"]
55
edition = "2021"
66
rust-version = "1.83.0"
@@ -138,8 +138,8 @@ arrow = "54.0.0"
138138
temp-dir = "0.1.14"
139139

140140
[package.metadata.parseable_ui]
141-
assets-url = "https://parseable-prism-build.s3.us-east-2.amazonaws.com/v2.1.1/build.zip"
142-
assets-sha1 = "d7b7a920cfcbfd59725dce6ad9e3d8f354cf9bf8"
141+
assets-url = "https://parseable-prism-build.s3.us-east-2.amazonaws.com/v2.2.0/build.zip"
142+
assets-sha1 = "6606fd794925eaa2c5e1815fd386c0682bea4f91"
143143

144144
[features]
145145
debug = []

‎Dockerfile.kafka‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,27 @@ RUN apt-get update && \
3535
WORKDIR /parseable
3636
COPY Cargo.toml Cargo.lock build.rs ./
3737

38-
# Create a dummy main.rs to pre-cache dependencies
39-
RUN mkdir src && echo "fn main() {}" > src/main.rs && \
40-
cargo build --release --features kafka && \
38+
# Fix librdkafka CMakeLists.txt before building
39+
RUN mkdir -p src && echo "fn main() {}" > src/main.rs && \
40+
# Download the package so it's in the cargo registry
41+
cargo fetch && \
42+
# Find rdkafka-sys directory
43+
RDKAFKA_SYS_DIR=$(find /usr/local/cargo/registry/src -name "rdkafka-sys-*" -type d | head -n 1) && \
44+
echo "Found rdkafka-sys at: $RDKAFKA_SYS_DIR" && \
45+
# Find the CMakeLists.txt file
46+
CMAKE_FILE="$RDKAFKA_SYS_DIR/librdkafka/CMakeLists.txt" && \
47+
if [ -f "$CMAKE_FILE" ]; then \
48+
echo "Found CMakeLists.txt at: $CMAKE_FILE" && \
49+
# Replace the minimum required version
50+
sed -i 's/cmake_minimum_required(VERSION 3.2)/cmake_minimum_required(VERSION 3.5)/' "$CMAKE_FILE" && \
51+
echo "Modified CMakeLists.txt to use CMake 3.5 minimum version"; \
52+
else \
53+
echo "Could not find librdkafka CMakeLists.txt file!" && \
54+
exit 1; \
55+
fi
56+
57+
# Now build dependencies with the fixed CMakeLists.txt
58+
RUN cargo build --release --features kafka && \
4159
rm -rf src
4260

4361
# Copy the actual source code

‎helm/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: parseable
33
description: Helm chart for Parseable - Fast Observability on S3
44
type: application
5-
version: 2.1.0
6-
appVersion: "v2.1.0"
5+
version: 2.2.0
6+
appVersion: "v2.2.0"
77
icon: "https://raw.githubusercontent.com/parseablehq/.github/main/images/new-logo.svg"
88

99
maintainers:

‎helm/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parseable:
22
image:
33
repository: containers.parseable.com/parseable/parseable
4-
tag: "v2.1.0"
4+
tag: "v2.2.0"
55
pullPolicy: Always
66
## object store can be local-store, s3-store, blob-store or gcs-store.
77
store: local-store

0 commit comments

Comments
 (0)