Skip to content

Deplatforming #7049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 47 commits into from
Jul 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
d08edb1
Stop building platform-specific variants of 3rd party libraries
eddyashton Jun 11, 2025
bb5f363
Cleanups from the last one, squash CCF_PROJECT values
eddyashton Jun 11, 2025
cd10c75
Stop building platform-specifics of _more_ libraries
eddyashton Jun 11, 2025
43d89c5
Probably too much for 1 commit! Remove COMPILE_TARGET, retain a CCF_T…
eddyashton Jun 11, 2025
5d4db59
Ophiological surgery
eddyashton Jun 11, 2025
1b8c48c
Remove snp.IS_SNP (retain related snp.SNP_SUPPORT), and format etc
eddyashton Jun 11, 2025
bc09875
More format
eddyashton Jun 11, 2025
3e8bd88
Undocument removed option
eddyashton Jun 11, 2025
9989345
Wrong case for type
eddyashton Jun 11, 2025
cff3bcd
Merge branch 'main' of github.com:microsoft/CCF into no_platforms
eddyashton Jun 11, 2025
76c29a5
lts_compat needs some restoration
eddyashton Jun 11, 2025
14f6229
Format
eddyashton Jun 11, 2025
c5941ee
Remove debug logging
eddyashton Jun 13, 2025
9bbfcac
Merge branch 'main' of github.com:microsoft/CCF into no_platforms
eddyashton Jun 13, 2025
b6fcb46
Better version check, for lts?
eddyashton Jun 13, 2025
0aec063
ahaerh
eddyashton Jun 13, 2025
f680361
Merge branch 'main' of github.com:microsoft/CCF into no_platforms
eddyashton Jun 13, 2025
0c95a1a
Merge branch 'main' of github.com:microsoft/CCF into no_platforms
eddyashton Jun 16, 2025
b8167f1
Doesn't feel right, but bump the version
eddyashton Jun 16, 2025
408972f
Update docs to remove platform-specific instructions
eddyashton Jun 16, 2025
e0122b4
Add an infra/platform.py file for platform auto-detection
eddyashton Jun 16, 2025
3c6dfe8
Try removing platform-dependent timeout
eddyashton Jun 16, 2025
f0753fb
Steps towards removing args.platform
eddyashton Jun 16, 2025
62c2768
Doesn't feel great, just a big find-replace
eddyashton Jun 16, 2025
f1d17f5
More plumbing
eddyashton Jun 20, 2025
e713dac
Confirm expected platform in CI pipelines
eddyashton Jun 20, 2025
cec3283
Check platforms for bencher too
eddyashton Jun 20, 2025
d41953a
Remove release matrix
eddyashton Jun 20, 2025
1b1e864
Format
eddyashton Jun 20, 2025
12f5e05
Morefat
eddyashton Jun 20, 2025
96b2478
Merge branch 'main' of github.com:microsoft/CCF into no_platforms
eddyashton Jun 20, 2025
be33511
Lol
eddyashton Jun 20, 2025
c0cd7e6
Fix tests of verifySnpAttestation. Use static attestation so we can t…
eddyashton Jun 20, 2025
f4c422e
Merge branch 'main' of github.com:microsoft/CCF into no_platforms
eddyashton Jun 30, 2025
7fce3d2
Merge fixups
eddyashton Jun 30, 2025
4265f86
Speculative fixes, and convinced myself this is untestable
eddyashton Jun 30, 2025
d45195c
Merge branch 'main' of github.com:microsoft/CCF into no_platforms
eddyashton Jul 4, 2025
cbb82fb
Update docs
eddyashton Jul 4, 2025
e4a2323
Bump version, add CHANGELOG
eddyashton Jul 4, 2025
021dbfc
Merge branch 'main' into no_platforms
achamayou Jul 8, 2025
a4e1547
Merge branch 'main' of https://github.com/microsoft/CCF into no_platf…
eddyashton Jul 9, 2025
4db8bd9
Bump version
eddyashton Jul 9, 2025
1717a31
Remove unused import
eddyashton Jul 9, 2025
1e9615e
Remove use of Python `global`
eddyashton Jul 9, 2025
d9a542f
farmot
eddyashton Jul 9, 2025
6f301b3
Merge branch 'main' into no_platforms
achamayou Jul 10, 2025
12906c0
foofmat
eddyashton Jul 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .cmake-format.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
"SRCS": "*",
"INCLUDE_DIRS": "*",
"SYSTEM_INCLUDE_DIRS": "*",
"LINK_LIBS_ENCLAVE": "*",
"LINK_LIBS_VIRTUAL": "*",
"LINK_LIBS_SNP": "*",
"LINK_LIBS": "*",
},
},
"add_client_exe": {
Expand Down
18 changes: 15 additions & 3 deletions .github/workflows/bencher.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,18 @@ jobs:
set -ex
./scripts/setup-ci.sh

- name: "Confirm running on Virtual"
run: |
set -ex
python3 tests/infra/platform_detection.py virtual
shell: bash

- name: Build and run virtual perf tests
run: |
git config --global --add safe.directory /__w/CCF/CCF
mkdir build
cd build
cmake -GNinja -DCOMPILE_TARGET=virtual -DWORKER_THREADS=2 -DBUILD_TPCC=ON ..
cmake -GNinja -DWORKER_THREADS=2 -DBUILD_TPCC=ON ..
ninja
# Microbenchmarks
./tests.sh -VV -L benchmark
Expand Down Expand Up @@ -69,12 +75,18 @@ jobs:
with:
fetch-depth: 0

- name: Build and run virtual perf tests
- name: "Confirm running on SEV-SNP"
run: |
set -ex
python3 tests/infra/platform_detection.py snp
shell: bash

- name: Build and run SNP perf tests
run: |
git config --global --add safe.directory /__w/CCF/CCF
mkdir build
cd build
cmake -GNinja -DCOMPILE_TARGET=virtual -DWORKER_THREADS=2 -DBUILD_TPCC=ON ..
cmake -GNinja -DWORKER_THREADS=2 -DBUILD_TPCC=ON ..
ninja
# Microbenchmarks
./tests.sh -VV -L benchmark
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-verification.yml
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ jobs:
git config --global --add safe.directory /__w/CCF/CCF
mkdir build
cd build
cmake -L -GNinja .. -DCMAKE_BUILD_TYPE=Debug -DVERBOSE_LOGGING=ON -DCOMPILE_TARGET=virtual -DCCF_RAFT_TRACING=ON
cmake -L -GNinja .. -DCMAKE_BUILD_TYPE=Debug -DVERBOSE_LOGGING=ON -DCCF_RAFT_TRACING=ON
ninja raft_driver
shell: bash

Expand Down
26 changes: 22 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
git config --global --add safe.directory /__w/CCF/CCF
mkdir build
cd build
cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DCLANG_TIDY=ON ..
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DCLANG_TIDY=ON ..
ninja
shell: bash

Expand Down Expand Up @@ -112,13 +112,19 @@ jobs:
set -ex
./scripts/setup-ci.sh

- name: "Confirm running on Virtual"
run: |
set -ex
python3 tests/infra/platform_detection.py virtual
shell: bash

- name: "Build Debug"
run: |
set -ex
git config --global --add safe.directory /__w/CCF/CCF
mkdir build
cd build
cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug ..
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug ..
ninja
shell: bash

Expand Down Expand Up @@ -178,13 +184,19 @@ jobs:
echo "::endgroup::"
shell: bash

- name: "Confirm running on SEV-SNP"
run: |
set -ex
python3 tests/infra/platform_detection.py snp
shell: bash

- name: "Build Debug"
run: |
set -ex
git config --global --add safe.directory /__w/CCF/CCF
mkdir build
cd build
cmake -GNinja -DCOMPILE_TARGET=snp -DCMAKE_BUILD_TYPE=Debug ..
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug ..
ninja
shell: bash

Expand Down Expand Up @@ -255,13 +267,19 @@ jobs:
echo "::endgroup::"
shell: bash

- name: "Confirm running on SEV-SNP"
run: |
set -ex
python3 tests/infra/platform_detection.py snp
shell: bash

- name: "Build Debug"
run: |
set -ex
git config --global --add safe.directory /__w/CCF/CCF
mkdir build
cd build
cmake -GNinja -DCOMPILE_TARGET=snp -DCMAKE_BUILD_TYPE=Debug ..
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug ..
ninja
shell: bash

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
git config --global --add safe.directory /__w/CCF/CCF
mkdir build
cd build
cmake -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=OFF ..
cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=OFF ..
shell: bash

- run: |
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/long-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
git config --global --add safe.directory /__w/CCF/CCF
mkdir build
cd build
cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DSAN=ON ..
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DSAN=ON ..
ninja

- name: "Test"
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
git config --global --add safe.directory /__w/CCF/CCF
mkdir build
cd build
cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DTSAN=ON -DWORKER_THREADS=2 ..
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DTSAN=ON -DWORKER_THREADS=2 ..
ninja

- name: "Test"
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
git config --global --add safe.directory /__w/CCF/CCF
mkdir build
cd build
cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DWORKER_THREADS=2 ..
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DWORKER_THREADS=2 ..
ninja

- name: "Test"
Expand Down Expand Up @@ -211,7 +211,7 @@ jobs:
mkdir build
cd build
# Use libc++ to enable hardening/bounds checking during tests
cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DUSE_LIBCXX=ON ..
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DUSE_LIBCXX=ON ..
ninja

- name: "Test"
Expand Down Expand Up @@ -265,7 +265,7 @@ jobs:
git config --global --add safe.directory /__w/CCF/CCF
mkdir build
cd build
cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Release -DCLIENT_PROTOCOLS_TEST=ON -DLONG_TESTS=ON ..
cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCLIENT_PROTOCOLS_TEST=ON -DLONG_TESTS=ON ..
ninja

- name: "Test"
Expand Down Expand Up @@ -319,7 +319,7 @@ jobs:
git config --global --add safe.directory /__w/CCF/CCF
mkdir build
cd build
cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DSHUFFLE_SUITE=ON ..
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DSHUFFLE_SUITE=ON ..
ninja

- name: "Test"
Expand Down
Loading
Loading