Skip to content

Commit e844c95

Browse files
Merge CI checks into VMSS A job (#7429)
Co-authored-by: Eddy Ashton <[email protected]>
1 parent 516fcaa commit e844c95

File tree

2 files changed

+11
-44
lines changed

2 files changed

+11
-44
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,8 @@ concurrency:
1414
permissions: read-all
1515

1616
jobs:
17-
checks:
18-
name: "Format and License Checks"
19-
runs-on:
20-
[
21-
self-hosted,
22-
1ES.Pool=gha-vmss-d16av5-ci,
23-
"JobId=ci_checks-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}",
24-
]
25-
container:
26-
image: mcr.microsoft.com/azurelinux/base/core:3.0
27-
options: --user root --publish-all --cap-add NET_ADMIN --cap-add NET_RAW --cap-add SYS_PTRACE
28-
29-
steps:
30-
- name: "Checkout dependencies"
31-
shell: bash
32-
run: |
33-
gpg --import /etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY
34-
tdnf -y update
35-
tdnf -y install ca-certificates git
36-
37-
- uses: actions/checkout@v5
38-
with:
39-
fetch-depth: 0
40-
41-
- name: Run CI checks
42-
run: |
43-
set -ex
44-
git config --global --add safe.directory /__w/CCF/CCF
45-
tdnf -y install tar npm build-essential
46-
./scripts/setup-dev.sh
47-
./scripts/ci-checks.sh
48-
shell: bash
49-
50-
ci-docs-tidy-unit-partitions:
51-
name: "Docs/clang-tidy/Unit/Partitions"
52-
needs: checks
17+
vmss-virtual-a:
18+
name: "VMSS Virtual A" # CI Checks, Clang Tidy, Python package tests, Doc build, Unit tests, Partitions tests
5319
runs-on:
5420
[
5521
self-hosted,
@@ -78,11 +44,13 @@ jobs:
7844
run: |
7945
set -ex
8046
./scripts/setup-ci.sh
47+
./scripts/setup-dev.sh
8148
82-
- name: "Build Debug with clang-tidy"
49+
- name: "Run Checks and Build Debug with clang-tidy"
8350
run: |
8451
set -ex
8552
git config --global --add safe.directory /__w/CCF/CCF
53+
./scripts/ci-checks.sh
8654
mkdir build
8755
cd build
8856
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DCLANG_TIDY=ON ..
@@ -125,9 +93,8 @@ jobs:
12593
cd build
12694
./tests.sh --timeout 360 --output-on-failure -L partitions -C partitions
12795
128-
build_and_test_virtual:
129-
name: "Virtual CI"
130-
needs: checks
96+
vmss-virtual-b:
97+
name: "VMSS Virtual B" # End-to-end tests, except for partitions
13198
runs-on:
13299
[
133100
self-hosted,
@@ -209,7 +176,6 @@ jobs:
209176
1ES.Pool=gha-c-aci-ci,
210177
"JobId=aci_snp_milan-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}",
211178
]
212-
needs: checks
213179

214180
steps:
215181
- uses: actions/checkout@v5
@@ -291,7 +257,6 @@ jobs:
291257
1ES.Pool=gha-aci-genoa,
292258
"JobId=aci_snp_genoa-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}",
293259
]
294-
needs: checks
295260

296261
steps:
297262
- uses: actions/checkout@v5

scripts/setup-dev.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
set -ex
66

77
tdnf -y install \
8-
vim \
98
clang-tools-extra \
109
python-pip \
11-
jq
10+
jq \
11+
tar \
12+
npm \
13+
build-essential
1214

1315
# For LTS test to extract binaries from rpms
1416
tdnf -y install cpio

0 commit comments

Comments
 (0)