Skip to content

Commit 24cc963

Browse files
authored
Merge branch 'main' into ci_tests
2 parents 53d2f9a + 6193a7c commit 24cc963

File tree

582 files changed

+39722
-70588
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

582 files changed

+39722
-70588
lines changed

.CodeQL.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/codeql/troubleshooting/bugs/generated-library-code
2+
path_classifiers:
3+
# Everything under tests is test code
4+
test:
5+
- tests
6+
# Everything under build is generated
7+
generated:
8+
- build
9+
# Everything under 3rdparty is external libraries
10+
library:
11+
- 3rdparty

.azure-pipelines-release.yml

-36
This file was deleted.

.azure-pipelines-templates/build_check.yml

-4
This file was deleted.

.azure-pipelines-templates/daily-matrix.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ parameters:
2727
cmake_args: "-DCOMPILE_TARGET=sgx"
2828
cmake_env: ""
2929
SNPCC:
30-
cmake_args: "-DCOMPILE_TARGET=snp -DLVI_MITIGATIONS=OFF -DLONG_TESTS=OFF"
30+
cmake_args: "-DCOMPILE_TARGET=snp -DLONG_TESTS=OFF"
3131
cmake_env: "CC=`which clang-15` CXX=`which clang++-15`"
3232
debug:
33-
cmake_args: "-DCMAKE_BUILD_TYPE=Debug -DLVI_MITIGATIONS=OFF"
33+
cmake_args: "-DCMAKE_BUILD_TYPE=Debug"
3434
cmake_env: ""
3535
ASAN:
36-
cmake_args: "-DSAN=ON"
36+
cmake_args: "-DSAN=ON -DUSE_LIBCXX=OFF"
3737
cmake_env: ""
3838
TSAN:
3939
cmake_args: "-DTSAN=ON -DWORKER_THREADS=2"
4040
cmake_env: ""
4141
unsafe:
42-
cmake_args: "-DLVI_MITIGATIONS=OFF -DVERBOSE_LOGGING=ON -DUNSAFE_VERSION=ON"
42+
cmake_args: "-DVERBOSE_LOGGING=ON -DUNSAFE_VERSION=ON"
4343
cmake_env: ""
4444

4545
jobs:

.azure-pipelines-templates/deploy_aci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
env:
5151
ACR_REGISTRY_RESOURCE_NAME: ccfmsrc
5252
ACR_REGISTRY: ccfmsrc.azurecr.io
53-
BASE_IMAGE: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
53+
BASE_IMAGE: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
5454
5555
- script: |
5656
set -ex

.azure-pipelines-templates/release-matrix.yaml

-115
This file was deleted.

.azure_pipelines_snp.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ schedules:
2222
resources:
2323
containers:
2424
- container: virtual
25-
image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
26-
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE -v /lib/modules:/lib/modules:ro
25+
image: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
26+
options: --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE
2727

2828
jobs:
2929
- template: .azure-pipelines-templates/deploy_aci.yml

.cmake-format.py

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
"CURL_CLIENT": "*",
2929
"CONFIGURATIONS": "*",
3030
"ADDITIONAL_ARGS": "*",
31-
"CONTAINER_NODES": "*",
3231
},
3332
},
3433
"add_perf_test": {

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# https://help.github.com/en/articles/about-code-owners
22

33
# Every review will request the CCF team as reviewer, unless a later match takes precedence
4-
* @Microsoft/ccf-code-reviewers
4+
* @Microsoft/ccf

.github/workflows/README.md

+15-22
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
Documents the various GitHub Actions workflows, the role they fulfil and 3rd party dependencies if any.
22

3-
# Backport
4-
5-
Attempts to auto-open backport PRs from main to LTS branch(es) whenever possible. This works well in the absence of conflicts, typically early on during the life of an LTS, and less well later. The alternatives are running the backport tool manually, or cherry picking commits.
6-
Triggered when the label `auto-backport` is applied to a PR, along with the `X.*-todo` label to set the target branch.
7-
8-
File: `backport.yml`
9-
3rd party dependencies: `sorenlouv/backport-github-action@main`
10-
113
# Bencher
124

135
Builds and runs CCF performance tests, both end to end and micro-benchmarks. Results are posted to bencher.dev, and [plotted to make regressions obvious](https://bencher.dev/console/projects/ccf/plots).
146
Triggered on every commit on `main`, but not on PR builds because the setup required to build from forks is complex and fragile in terms of security, and the increase in pool usage would be substantial.
157

168
File: `bencher.yml`
17-
3rd party dependencies: `bencherdev/bencher@main`
9+
3rd party dependencies:
10+
11+
- `bencherdev/bencher@main`
1812

1913
# Continuous Integration Containers GHCR
2014

@@ -28,6 +22,8 @@ File: `ci-containers-ghcr.yml`
2822
- `docker/metadata-action@v5`
2923
- `docker/build-push-action@v6`
3024

25+
Note: This job will be removed with Ubuntu support, because installing dependencies on Azure Linux images is very fast, and producing CI-specific images is no longer necessary there.
26+
3127
# Continuous Integration
3228

3329
Main continuous integration job. Builds CCF for all target platforms, runs unit, end to end and partition tests Virtual. Run on every commit, including PRs from forks, gates merging. Also runs once a week, regardless of commits.
@@ -37,10 +33,10 @@ File: `ci.yml`
3733

3834
# Long Tests
3935

40-
Secondary continuous integration job. Runs more expensive, longer tests, such as tests against ASAN builds, fuzzing etc.
36+
Secondary continuous integration job. Runs more expensive, longer tests, such as tests against ASAN and TSAN builds, fuzzing etc.
4137

42-
- Runs daily.
43-
- Can be manually run on a PR by setting `run-long-test` label.
38+
- Runs daily on week days.
39+
- Can be manually run on a PR by setting `run-long-test` label, or via workflow dispatch.
4440

4541
File: `long-test.yml`
4642
3rd party dependencies: None
@@ -50,7 +46,10 @@ File: `long-test.yml`
5046
Builds CCF with CodeQL, and runs the security-extended checks. Triggered on PRs that affect ".github/workflows/codeql-analysis.yml", and once a week on main.
5147

5248
File: `codeql-analysis.yml`
53-
3rd party dependencies: None
49+
3rd party dependencies:
50+
51+
- `github/codeql-action/init@v3`
52+
- `github/codeql-action/analyze@v3`
5453

5554
# Continuous Verification
5655

@@ -71,7 +70,7 @@ File: `long-verification.yml`
7170

7271
# Release
7372

74-
Produces CCF release artefacts from 5.0.0-rc0 onwards, for all languages and platforms. Triggered on tags matching "ccf-5.\*". The output of the job is a draft release, which needs to be published manually. Publishing triggers the downstream jobs listed below.
73+
Produces CCF release artefacts from 5.0.0-rc0 onwards, for all languages and platforms. Triggered on tags matching `ccf-[56].\*`. The output of the job is a draft release, which needs to be published manually. Publishing triggers the downstream jobs listed below.
7574

7675
File: `release.yml`
7776
3rd party dependencies: None
@@ -106,12 +105,6 @@ File: `pypi.yml`
106105
Builds and publishes documentation to GitHub Pages. Triggered on pushes to main, and manually. Note that special permissions (Settings > Environment) are configured.
107106

108107
File: `doc.yml`
109-
3rd party dependencies: None
110-
111-
# Deprecated
112-
113-
The following pipelines are still here to support 4.x, but will be removed when it reaches EOL.
114-
115-
## Release containers ACR/MCR
108+
3rd party dependencies:
116109

117-
File: `containers.yml`
110+
- peaceiris/actions-gh-pages@v3

.github/workflows/backport.yml

-49
This file was deleted.

.github/workflows/bencher.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: "Bencher: Run Benchmarks"
22

33
on:
4+
schedule:
5+
- cron: "0 0 * * 0"
46
push:
57
branches:
68
- main
@@ -11,7 +13,7 @@ jobs:
1113
name: Continuous Benchmarking with Bencher
1214
runs-on: [self-hosted, 1ES.Pool=gha-virtual-ccf-sub]
1315
container:
14-
image: ghcr.io/microsoft/ccf/ci/default:build-08-10-2024
16+
image: ghcr.io/microsoft/ccf/ci/default:build-14-01-2025
1517
steps:
1618
- uses: actions/checkout@v4
1719
with:

.github/workflows/ci-containers-ghcr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
labels: ${{ steps.meta_default.outputs.labels }}
5050

5151
- name: Attest default container
52-
uses: actions/attest-build-provenance@v1
52+
uses: actions/attest-build-provenance@v2
5353
with:
5454
subject-name: ${{ env.REGISTRY }}/${{ github.repository }}/ci/default
5555
subject-digest: ${{ steps.push_default.outputs.digest }}

0 commit comments

Comments
 (0)