Skip to content

Commit cc4a8d0

Browse files
qdeslandesqdeslandes
committed
wip
1 parent 7c3b51a commit cc4a8d0

File tree

1 file changed

+126
-121
lines changed

1 file changed

+126
-121
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 126 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -21,101 +21,101 @@ permissions:
2121
packages: write
2222

2323
jobs:
24-
create-containers:
25-
timeout-minutes: 15
26-
strategy:
27-
matrix:
28-
host:
29-
- { name: ubuntu-24.04, arch: x64 }
30-
- { name: 4-core-ubuntu-arm, arch: arm64 }
31-
distribution:
32-
- { name: fedora, version: "41" }
33-
- { name: fedora, version: "40" }
34-
- { name: fedora, version: "39" }
35-
- { name: ubuntu, version: "24.10" }
36-
- { name: ubuntu, version: "24.04" }
37-
runs-on: ["${{ matrix.host.name }}"]
38-
name: "Prepare: ${{ matrix.distribution.name }} ${{ matrix.distribution.version }} (${{ matrix.host.arch}})"
39-
steps:
40-
- name: Checkout repository
41-
uses: actions/checkout@v2
42-
- name: Set up Docker Buildx
43-
uses: docker/setup-buildx-action@v3
44-
- name: Log to GHCR
45-
uses: docker/login-action@v2
46-
with:
47-
registry: ${{ env.REGISTRY }}
48-
username: ${{ github.actor }}
49-
password: ${{ secrets.GITHUB_TOKEN }}
50-
- name: Build and push container image
51-
id: build-and-push
52-
uses: docker/build-push-action@v4
53-
with:
54-
file: .github/${{ matrix.distribution.name }}-${{ matrix.distribution.version }}.Dockerfile
55-
push: true
56-
tags: ghcr.io/facebook/bpfilter:${{ matrix.distribution.name }}-${{ matrix.distribution.version }}-${{ matrix.host.arch}}
57-
cache-from: type=gha,scope=${{ matrix.distribution.name }}-${{ matrix.distribution.version }}-${{ matrix.host.arch}}
58-
cache-to: type=gha,mode=max,scope=${{ matrix.distribution.name }}-${{ matrix.distribution.version }}-${{ matrix.host.arch}}
24+
# create-containers:
25+
# timeout-minutes: 15
26+
# strategy:
27+
# matrix:
28+
# host:
29+
# - { name: ubuntu-24.04, arch: x64 }
30+
# - { name: 4-core-ubuntu-arm, arch: arm64 }
31+
# distribution:
32+
# - { name: fedora, version: "41" }
33+
# - { name: fedora, version: "40" }
34+
# - { name: fedora, version: "39" }
35+
# - { name: ubuntu, version: "24.10" }
36+
# - { name: ubuntu, version: "24.04" }
37+
# runs-on: ["${{ matrix.host.name }}"]
38+
# name: "Prepare: ${{ matrix.distribution.name }} ${{ matrix.distribution.version }} (${{ matrix.host.arch}})"
39+
# steps:
40+
# - name: Checkout repository
41+
# uses: actions/checkout@v2
42+
# - name: Set up Docker Buildx
43+
# uses: docker/setup-buildx-action@v3
44+
# - name: Log to GHCR
45+
# uses: docker/login-action@v2
46+
# with:
47+
# registry: ${{ env.REGISTRY }}
48+
# username: ${{ github.actor }}
49+
# password: ${{ secrets.GITHUB_TOKEN }}
50+
# - name: Build and push container image
51+
# id: build-and-push
52+
# uses: docker/build-push-action@v4
53+
# with:
54+
# file: .github/${{ matrix.distribution.name }}-${{ matrix.distribution.version }}.Dockerfile
55+
# push: true
56+
# tags: ghcr.io/facebook/bpfilter:${{ matrix.distribution.name }}-${{ matrix.distribution.version }}-${{ matrix.host.arch}}
57+
# cache-from: type=gha,scope=${{ matrix.distribution.name }}-${{ matrix.distribution.version }}-${{ matrix.host.arch}}
58+
# cache-to: type=gha,mode=max,scope=${{ matrix.distribution.name }}-${{ matrix.distribution.version }}-${{ matrix.host.arch}}
5959

60-
build:
61-
needs: create-containers
62-
strategy:
63-
matrix:
64-
host:
65-
- name: "ubuntu-24.04"
66-
arch: "x64"
67-
- name: "4-core-ubuntu-arm"
68-
arch: "arm64"
69-
distribution:
70-
- name: fedora
71-
version: 41
72-
- name: fedora
73-
version: 40
74-
- name: fedora
75-
version: 39
76-
- name: ubuntu
77-
version: "24.04"
78-
- name: ubuntu
79-
version: "24.10"
80-
runs-on: ["${{ matrix.host.name }}"]
81-
timeout-minutes: 5
82-
container: ghcr.io/facebook/bpfilter:${{ matrix.distribution.name }}-${{ matrix.distribution.version }}-${{ matrix.host.arch}}
83-
name: "Build: ${{ matrix.distribution.name }} ${{ matrix.distribution.version }} (${{ matrix.host.arch}})"
84-
steps:
85-
- name: Checkout repository
86-
uses: actions/checkout@v2
87-
- name: Configure build
88-
run: cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build -DCMAKE_BUILD_TYPE=release
89-
- name: Build
90-
run: make -C $GITHUB_WORKSPACE/build -j `nproc`
60+
# build:
61+
# needs: create-containers
62+
# strategy:
63+
# matrix:
64+
# host:
65+
# - name: "ubuntu-24.04"
66+
# arch: "x64"
67+
# - name: "4-core-ubuntu-arm"
68+
# arch: "arm64"
69+
# distribution:
70+
# - name: fedora
71+
# version: 41
72+
# - name: fedora
73+
# version: 40
74+
# - name: fedora
75+
# version: 39
76+
# - name: ubuntu
77+
# version: "24.04"
78+
# - name: ubuntu
79+
# version: "24.10"
80+
# runs-on: ["${{ matrix.host.name }}"]
81+
# timeout-minutes: 5
82+
# container: ghcr.io/facebook/bpfilter:${{ matrix.distribution.name }}-${{ matrix.distribution.version }}-${{ matrix.host.arch}}
83+
# name: "Build: ${{ matrix.distribution.name }} ${{ matrix.distribution.version }} (${{ matrix.host.arch}})"
84+
# steps:
85+
# - name: Checkout repository
86+
# uses: actions/checkout@v2
87+
# - name: Configure build
88+
# run: cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build -DCMAKE_BUILD_TYPE=release
89+
# - name: Build
90+
# run: make -C $GITHUB_WORKSPACE/build -j `nproc`
9191

92-
tests:
93-
needs: create-containers
94-
strategy:
95-
matrix:
96-
host:
97-
- name: "ubuntu-24.04"
98-
arch: "x64"
99-
- name: "4-core-ubuntu-arm"
100-
arch: "arm64"
101-
runs-on: ["${{ matrix.host.name }}"]
102-
name: "Tests: ${{ matrix.host.arch }}"
103-
container:
104-
image: ghcr.io/facebook/bpfilter:fedora-41-${{ matrix.host.arch }}
105-
options: --privileged
106-
timeout-minutes: 5
107-
steps:
108-
- name: Checkout repository
109-
uses: actions/checkout@v2
110-
- name: Configure build
111-
run: cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build
112-
- name: Build
113-
run: make -C $GITHUB_WORKSPACE/build -j `nproc` test
114-
- name: Build
115-
run: make -C $GITHUB_WORKSPACE/build -j `nproc` e2e
92+
# tests:
93+
# needs: create-containers
94+
# strategy:
95+
# matrix:
96+
# host:
97+
# - name: "ubuntu-24.04"
98+
# arch: "x64"
99+
# - name: "4-core-ubuntu-arm"
100+
# arch: "arm64"
101+
# runs-on: ["${{ matrix.host.name }}"]
102+
# name: "Tests: ${{ matrix.host.arch }}"
103+
# container:
104+
# image: ghcr.io/facebook/bpfilter:fedora-41-${{ matrix.host.arch }}
105+
# options: --privileged
106+
# timeout-minutes: 5
107+
# steps:
108+
# - name: Checkout repository
109+
# uses: actions/checkout@v2
110+
# - name: Configure build
111+
# run: cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build
112+
# - name: Build
113+
# run: make -C $GITHUB_WORKSPACE/build -j `nproc` test
114+
# - name: Build
115+
# run: make -C $GITHUB_WORKSPACE/build -j `nproc` e2e
116116

117117
benchmark:
118-
needs: create-containers
118+
# needs: create-containers
119119
strategy:
120120
matrix:
121121
host:
@@ -142,36 +142,41 @@ jobs:
142142
uses: actions/cache@v4
143143
with:
144144
path: $GITHUB_WORKSPACE/build/benchmark-cache
145-
key: bpfilter-benchmark-results
145+
key: bpfilter-benchmark-results-${{ matrix.host.arch }}
146146
- name: Copy the benchmark results to the cache
147-
run: cp $GITHUB_WORKSPACE/build/output/*.json $GITHUB_WORKSPACE/build/cache/
147+
run: cp $GITHUB_WORKSPACE/build/output/*.json $GITHUB_WORKSPACE/build/benchmark-cache/
148+
- name: Cache the benchmark results
149+
uses: actions/cache@v4
150+
with:
151+
path: $GITHUB_WORKSPACE/build/benchmark-cache
152+
key: bpfilter-benchmark-results-${{ matrix.host.arch }}
148153

149-
check:
150-
needs: create-containers
151-
runs-on: ["ubuntu-24.04"]
152-
name: "Check"
153-
container:
154-
image: ghcr.io/facebook/bpfilter:fedora-41-x64
155-
timeout-minutes: 5
156-
steps:
157-
- name: Checkout repository
158-
uses: actions/checkout@v2
159-
- name: Configure build
160-
run: cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build
161-
- name: Build
162-
run: make -C $GITHUB_WORKSPACE/build -j `nproc` check
154+
# check:
155+
# needs: create-containers
156+
# runs-on: ["ubuntu-24.04"]
157+
# name: "Check"
158+
# container:
159+
# image: ghcr.io/facebook/bpfilter:fedora-41-x64
160+
# timeout-minutes: 5
161+
# steps:
162+
# - name: Checkout repository
163+
# uses: actions/checkout@v2
164+
# - name: Configure build
165+
# run: cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build
166+
# - name: Build
167+
# run: make -C $GITHUB_WORKSPACE/build -j `nproc` check
163168

164-
doc:
165-
needs: create-containers
166-
runs-on: ["ubuntu-24.04"]
167-
name: "Documentation"
168-
container:
169-
image: ghcr.io/facebook/bpfilter:fedora-41-x64
170-
timeout-minutes: 5
171-
steps:
172-
- name: Checkout repository
173-
uses: actions/checkout@v2
174-
- name: Configure build
175-
run: cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build
176-
- name: Build
177-
run: make -C $GITHUB_WORKSPACE/build -j `nproc` doc
169+
# doc:
170+
# needs: create-containers
171+
# runs-on: ["ubuntu-24.04"]
172+
# name: "Documentation"
173+
# container:
174+
# image: ghcr.io/facebook/bpfilter:fedora-41-x64
175+
# timeout-minutes: 5
176+
# steps:
177+
# - name: Checkout repository
178+
# uses: actions/checkout@v2
179+
# - name: Configure build
180+
# run: cmake -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build
181+
# - name: Build
182+
# run: make -C $GITHUB_WORKSPACE/build -j `nproc` doc

0 commit comments

Comments
 (0)