Skip to content

Commit d28ec15

Browse files
authored
ci: empty OPTFLAGS if sccache is used (#441)
#436 (comment) Signed-off-by: usamoi <usamoi@outlook.com>
1 parent 6aa7153 commit d28ec15

File tree

8 files changed

+57
-53
lines changed

8 files changed

+57
-53
lines changed

.github/workflows/check.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -378,8 +378,8 @@ jobs:
378378
379379
mkdir ~/pgvector-install
380380
curl -fsSL https://github.com/pgvector/pgvector/archive/refs/tags/v0.8.1.tar.gz | tar -xz -C ~/pgvector-install
381-
make -C ~/pgvector-install/pgvector-0.8.1 PG_CONFIG=$(brew --prefix postgresql@${{ matrix.version }})/bin/pg_config CC='sccache clang'
382-
sudo make -C ~/pgvector-install/pgvector-0.8.1 PG_CONFIG=$(brew --prefix postgresql@${{ matrix.version }})/bin/pg_config CC='sccache clang' install
381+
make -C ~/pgvector-install/pgvector-0.8.1 PG_CONFIG=$(brew --prefix postgresql@${{ matrix.version }})/bin/pg_config CC='sccache clang' OPTFLAGS=""
382+
sudo make -C ~/pgvector-install/pgvector-0.8.1 PG_CONFIG=$(brew --prefix postgresql@${{ matrix.version }})/bin/pg_config CC='sccache clang' OPTFLAGS="" install
383383
384384
- name: Checkout
385385
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -619,8 +619,8 @@ jobs:
619619
620620
mkdir ~/pgvector-install
621621
curl -fsSL https://github.com/pgvector/pgvector/archive/refs/tags/v0.8.1.tar.gz | tar -xz -C ~/pgvector-install
622-
make -C ~/pgvector-install/pgvector-0.8.1 PG_CONFIG=/usr/libexec/postgresql${{ matrix.version }}/pg_config CC='sccache clang-18'
623-
make -C ~/pgvector-install/pgvector-0.8.1 PG_CONFIG=/usr/libexec/postgresql${{ matrix.version }}/pg_config CC='sccache clang-18' install
622+
make -C ~/pgvector-install/pgvector-0.8.1 PG_CONFIG=/usr/libexec/postgresql${{ matrix.version }}/pg_config CC='sccache clang-18' OPTFLAGS=""
623+
make -C ~/pgvector-install/pgvector-0.8.1 PG_CONFIG=/usr/libexec/postgresql${{ matrix.version }}/pg_config CC='sccache clang-18' OPTFLAGS="" install
624624
625625
- name: Checkout
626626
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -1022,8 +1022,8 @@ jobs:
10221022
mkdir ~/pgvector-install
10231023
curl -fsSL https://github.com/pgvector/pgvector/archive/refs/tags/v0.8.1.tar.gz | tar -xz -C ~/pgvector-install
10241024
pushd ~/pgvector-install/pgvector-0.8.1
1025-
make -j$(nproc)
1026-
sudo make install
1025+
make OPTFLAGS="" -j$(nproc)
1026+
sudo make OPTFLAGS="" install
10271027
popd
10281028
10291029
- name: Checkout

crates/index/src/tuples.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ impl<'a> MutChecker<'a> {
137137
#[test]
138138
fn aliasing_test() {
139139
#[repr(C, align(8))]
140-
#[derive(Debug, Clone, PartialEq, FromBytes, IntoBytes, Immutable, KnownLayout)]
140+
#[derive(Debug, Clone, FromBytes, IntoBytes, Immutable, KnownLayout)]
141141
struct ExampleHeader {
142142
elements_s: u16,
143143
elements_e: u16,

crates/vchordg/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub use search::search;
3838
use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
3939

4040
#[repr(C, align(8))]
41-
#[derive(Debug, Clone, Copy, PartialEq, FromBytes, IntoBytes, Immutable, KnownLayout)]
41+
#[derive(Debug, Clone, Copy, FromBytes, IntoBytes, Immutable, KnownLayout)]
4242
pub struct Opaque {
4343
pub next: u32,
4444
pub link: u32,

crates/vchordg/src/tuples.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub trait WithWriter: Tuple {
4747
}
4848

4949
#[repr(C, align(8))]
50-
#[derive(Debug, Clone, PartialEq, FromBytes, IntoBytes, Immutable, KnownLayout)]
50+
#[derive(Debug, Clone, FromBytes, IntoBytes, Immutable, KnownLayout)]
5151
struct MetaTupleHeader {
5252
version: u64,
5353
dim: u32,
@@ -206,7 +206,7 @@ impl<'a> MetaTupleWriter<'a> {
206206
}
207207

208208
#[repr(C, align(8))]
209-
#[derive(Debug, Clone, PartialEq, FromBytes, IntoBytes, Immutable, KnownLayout)]
209+
#[derive(Debug, Clone, FromBytes, IntoBytes, Immutable, KnownLayout)]
210210
struct VertexTupleHeader {
211211
metadata: [f32; 3],
212212
elements_s: u16,
@@ -217,7 +217,7 @@ struct VertexTupleHeader {
217217
_padding_0: [Padding; 4],
218218
}
219219

220-
#[derive(Debug, Clone, PartialEq)]
220+
#[derive(Debug, Clone)]
221221
pub struct VertexTuple {
222222
pub metadata: [f32; 3],
223223
pub elements: Vec<u64>,
@@ -292,7 +292,7 @@ impl WithWriter for VertexTuple {
292292
}
293293
}
294294

295-
#[derive(Debug, Clone, Copy, PartialEq)]
295+
#[derive(Debug, Clone, Copy)]
296296
pub struct VertexTupleReader<'a> {
297297
header: &'a VertexTupleHeader,
298298
elements: &'a [u64],
@@ -339,7 +339,7 @@ impl VertexTupleWriter<'_> {
339339
}
340340

341341
#[repr(C, align(8))]
342-
#[derive(Debug, Clone, PartialEq, FromBytes, IntoBytes, Immutable, KnownLayout)]
342+
#[derive(Debug, Clone, FromBytes, IntoBytes, Immutable, KnownLayout)]
343343
struct VectorTupleHeader0 {
344344
payload: Option<NonZero<u64>>,
345345
elements_s: u16,
@@ -352,15 +352,15 @@ struct VectorTupleHeader0 {
352352
}
353353

354354
#[repr(C, align(8))]
355-
#[derive(Debug, Clone, PartialEq, FromBytes, IntoBytes, Immutable, KnownLayout)]
355+
#[derive(Debug, Clone, FromBytes, IntoBytes, Immutable, KnownLayout)]
356356
struct VectorTupleHeader1 {
357357
payload: Option<NonZero<u64>>,
358358
elements_s: u16,
359359
elements_e: u16,
360360
index: u32,
361361
}
362362

363-
#[derive(Debug, Clone, PartialEq)]
363+
#[derive(Debug, Clone)]
364364
pub enum VectorTuple<V: Vector> {
365365
_0 {
366366
payload: Option<NonZero<u64>>,
@@ -528,7 +528,7 @@ impl<'a, V: Vector> Clone for VectorTupleReader<'a, V> {
528528
}
529529
}
530530

531-
#[derive(Debug, PartialEq)]
531+
#[derive(Debug)]
532532
pub struct VectorTupleReader0<'a, V: Vector> {
533533
header: &'a VectorTupleHeader0,
534534
elements: &'a [V::Element],
@@ -562,7 +562,7 @@ impl<'a, V: Vector> VectorTupleReader0<'a, V> {
562562
}
563563
}
564564

565-
#[derive(Debug, PartialEq)]
565+
#[derive(Debug)]
566566
pub struct VectorTupleReader1<'a, V: Vector> {
567567
header: &'a VectorTupleHeader1,
568568
elements: &'a [V::Element],

crates/vchordrq/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ pub use search::{default_search, maxsim_search};
5050
use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
5151

5252
#[repr(C, align(8))]
53-
#[derive(Debug, Clone, Copy, PartialEq, FromBytes, IntoBytes, Immutable, KnownLayout)]
53+
#[derive(Debug, Clone, Copy, FromBytes, IntoBytes, Immutable, KnownLayout)]
5454
pub struct Opaque {
5555
pub next: u32,
5656
pub skip: u32,

0 commit comments

Comments
 (0)