Skip to content

Commit 649a7cb

Browse files
committed
workflow: build eBPF optimizer in container
Signed-off-by: Bin Tang <[email protected]>
1 parent 080266f commit 649a7cb

File tree

3 files changed

+11
-37
lines changed

3 files changed

+11
-37
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
jobs:
1313
build:
1414
name: Build and Lint
15-
timeout-minutes: 10
15+
timeout-minutes: 20
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Set up Go
@@ -33,17 +33,13 @@ jobs:
3333
go install github.com/golangci/golangci-lint/cmd/[email protected]
3434
export PATH=$PATH:$(go env GOPATH)/bin
3535
make
36-
make test
37-
make check
36+
make container-test
37+
make container-check
3838
build-optimizer:
3939
name: Build optimizer
40-
timeout-minutes: 10
40+
timeout-minutes: 20
4141
runs-on: ubuntu-latest
4242
steps:
43-
- name: Set up Go
44-
uses: actions/setup-go@v3
45-
with:
46-
go-version: "1.20.1"
4743
- name: Check out code
4844
uses: actions/checkout@v3
4945
- name: cache go mod
@@ -55,19 +51,12 @@ jobs:
5551
${{ runner.os }}-go
5652
- name: Build
5753
run: |
58-
go install github.com/golangci/golangci-lint/cmd/[email protected]
59-
export PATH=$PATH:$(go env GOPATH)/bin
60-
rustup component add rustfmt clippy
61-
make build-optimizer
54+
make container-build-optimizer
6255
smoke:
6356
name: Smoke
64-
timeout-minutes: 10
57+
timeout-minutes: 20
6558
runs-on: ubuntu-latest
6659
steps:
67-
- name: Set up Go
68-
uses: actions/setup-go@v3
69-
with:
70-
go-version: "1.19.6"
7160
- name: Check out code
7261
uses: actions/checkout@v3
7362
- name: cache go mod
@@ -118,14 +107,10 @@ jobs:
118107
119108
coverage:
120109
name: Code coverage
121-
timeout-minutes: 10
110+
timeout-minutes: 20
122111
runs-on: ubuntu-latest
123112
needs: [build]
124113
steps:
125-
- name: Install Go
126-
uses: actions/setup-go@v3
127-
with:
128-
go-version: "1.19.6"
129114
- name: Checkout code
130115
uses: actions/checkout@v3
131116
- name: cache go mod
@@ -136,7 +121,7 @@ jobs:
136121
restore-keys: |
137122
${{ runner.os }}-go
138123
- name: Run unit tests.
139-
run: make cover
124+
run: make container-cover
140125
- name: Upload coverage to Codecov
141126
uses: codecov/codecov-action@v3
142127
with:

.github/workflows/optimizer.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ jobs:
2121
run_optimizer:
2222
runs-on: ubuntu-latest
2323
steps:
24-
- name: Set up Go
25-
uses: actions/setup-go@v3
26-
with:
27-
go-version: "1.19.6"
2824
- name: Checkout repository
2925
uses: actions/checkout@v3
3026
- name: cache go mod
@@ -66,9 +62,7 @@ jobs:
6662
sudo install -D -m 755 misc/example/10-containerd-net.conflist /etc/cni/net.d/10-containerd-net.conflist
6763
- name: Build and install optimizer
6864
run: |
69-
rustup component add rustfmt clippy
70-
make optimizer
71-
sudo chown -R $(id -un):$(id -gn) . ~/.cargo/
65+
make container-optimizer
7266
pwd
7367
ls -lh bin/*optimizer*
7468
sudo make install-optimizer
@@ -87,7 +81,7 @@ jobs:
8781
echo "count: $count expected minimum value: $expected"
8882
if [ $count -lt $expected ]; then
8983
echo "failed to generate accessed files list for nginx:1.23.3"
90-
cat misc/optimizer/script/file_list.txt
84+
cat /opt/nri/optimizer/results/library/nginx:1.23.3
9185
exit 1
9286
fi
9387
cat /opt/nri/optimizer/results/library/nginx:1.23.3.csv

.github/workflows/release.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v3
18-
- uses: actions/setup-go@v3
19-
with:
20-
go-version: "1.19.6"
2118
- name: cache go mod
2219
uses: actions/cache@v3
2320
with:
@@ -39,9 +36,7 @@ jobs:
3936
${{ runner.os }}-cargo
4037
- name: build nydus-snapshotter and optimizer
4138
run: |
42-
go install github.com/golangci/golangci-lint/cmd/[email protected]
43-
export PATH=$PATH:$(go env GOPATH)/bin
44-
make static-release
39+
make container-static-release
4540
- name: upload artifacts
4641
uses: actions/upload-artifact@v3
4742
with:

0 commit comments

Comments
 (0)