Skip to content

Commit bd02bf7

Browse files
MizuxMizux
committed
ci: cleanup
1 parent 4dc476c commit bd02bf7

File tree

3 files changed

+67
-56
lines changed

3 files changed

+67
-56
lines changed

‎.github/workflows/amd64_docker_cmake.yml

+9-10
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ jobs:
1111
docker:
1212
strategy:
1313
matrix:
14-
platform: [amd64] # arm64 riscv64
1514
distro: [
1615
almalinux,
1716
alpine,
@@ -23,7 +22,7 @@ jobs:
2322
ubuntu
2423
]
2524
fail-fast: false
26-
name: ${{matrix.platform}}•${{matrix.distro}}•CMake
25+
name: amd64•${{matrix.distro}}•CMake
2726
runs-on: ubuntu-latest
2827
steps:
2928
- uses: actions/checkout@v4
@@ -32,22 +31,22 @@ jobs:
3231
docker info
3332
docker buildx ls
3433
- name: Build env image
35-
run: make --directory=ci ${{matrix.platform}}_${{matrix.distro}}_env
34+
run: make --directory=ci amd64_${{matrix.distro}}_env
3635
- name: Build devel image
37-
run: make --directory=ci ${{matrix.platform}}_${{matrix.distro}}_devel
36+
run: make --directory=ci amd64_${{matrix.distro}}_devel
3837
- name: Build project
39-
run: make --directory=ci ${{matrix.platform}}_${{matrix.distro}}_build
38+
run: make --directory=ci amd64_${{matrix.distro}}_build
4039
- name: Test project
41-
run: make --directory=ci ${{matrix.platform}}_${{matrix.distro}}_test
40+
run: make --directory=ci amd64_${{matrix.distro}}_test
4241

4342
- name: Build install env image
44-
run: make --directory=ci ${{matrix.platform}}_${{matrix.distro}}_install_env
43+
run: make --directory=ci amd64_${{matrix.distro}}_install_env
4544
- name: Build install devel image
46-
run: make --directory=ci ${{matrix.platform}}_${{matrix.distro}}_install_devel
45+
run: make --directory=ci amd64_${{matrix.distro}}_install_devel
4746
- name: Build install project
48-
run: make --directory=ci ${{matrix.platform}}_${{matrix.distro}}_install_build
47+
run: make --directory=ci amd64_${{matrix.distro}}_install_build
4948
- name: Test install project
50-
run: make --directory=ci ${{matrix.platform}}_${{matrix.distro}}_install_test
49+
run: make --directory=ci amd64_${{matrix.distro}}_install_test
5150

5251
amd64_docker_cmake:
5352
runs-on: ubuntu-latest

‎.github/workflows/arm64_docker_cmake.yml

+29-23
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,33 @@ jobs:
2424
name: arm64•${{matrix.distro}}
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v4
28-
- name: Set up QEMU
29-
uses: docker/setup-qemu-action@v3
30-
- name: Check docker
31-
run: |
32-
docker info
33-
docker buildx ls
34-
- name: Build env image
35-
run: make --directory=ci arm64_${{matrix.distro}}_env
36-
- name: Build devel project
37-
run: make --directory=ci arm64_${{matrix.distro}}_devel
38-
- name: Build project
39-
run: make --directory=ci arm64_${{matrix.distro}}_build
40-
- name: Test project
41-
run: make --directory=ci arm64_${{matrix.distro}}_test
27+
- uses: actions/checkout@v4
28+
- name: Set up QEMU
29+
uses: docker/setup-qemu-action@v3
30+
- name: Check docker
31+
run: |
32+
docker info
33+
docker buildx ls
34+
- name: Build env image
35+
run: make --directory=ci arm64_${{matrix.distro}}_env
36+
- name: Build devel project
37+
run: make --directory=ci arm64_${{matrix.distro}}_devel
38+
- name: Build project
39+
run: make --directory=ci arm64_${{matrix.distro}}_build
40+
- name: Test project
41+
run: make --directory=ci arm64_${{matrix.distro}}_test
4242

43-
- name: Build install env image
44-
run: make --directory=ci arm64_${{matrix.distro}}_install_env
45-
- name: Build install devel project
46-
run: make --directory=ci arm64_${{matrix.distro}}_install_devel
47-
- name: Build install project
48-
run: make --directory=ci arm64_${{matrix.distro}}_install_build
49-
- name: Test install project
50-
run: make --directory=ci arm64_${{matrix.distro}}_install_test
43+
- name: Build install env image
44+
run: make --directory=ci arm64_${{matrix.distro}}_install_env
45+
- name: Build install devel project
46+
run: make --directory=ci arm64_${{matrix.distro}}_install_devel
47+
- name: Build install project
48+
run: make --directory=ci arm64_${{matrix.distro}}_install_build
49+
- name: Test install project
50+
run: make --directory=ci arm64_${{matrix.distro}}_install_test
51+
52+
arm64_docker_cmake:
53+
runs-on: ubuntu-latest
54+
needs: docker
55+
steps:
56+
- uses: actions/checkout@v4

‎.github/workflows/riscv64_docker_cmake.yml

+29-23
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,33 @@ jobs:
2424
name: riscv64•${{matrix.distro}}
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v4
28-
- name: Set up QEMU
29-
uses: docker/setup-qemu-action@v3
30-
- name: Check docker
31-
run: |
32-
docker info
33-
docker buildx ls
34-
- name: Build env image
35-
run: make --directory=ci riscv64_${{matrix.distro}}_env
36-
- name: Build devel project
37-
run: make --directory=ci riscv64_${{matrix.distro}}_devel
38-
- name: Build project
39-
run: make --directory=ci riscv64_${{matrix.distro}}_build
40-
- name: Test project
41-
run: make --directory=ci riscv64_${{matrix.distro}}_test
27+
- uses: actions/checkout@v4
28+
- name: Set up QEMU
29+
uses: docker/setup-qemu-action@v3
30+
- name: Check docker
31+
run: |
32+
docker info
33+
docker buildx ls
34+
- name: Build env image
35+
run: make --directory=ci riscv64_${{matrix.distro}}_env
36+
- name: Build devel project
37+
run: make --directory=ci riscv64_${{matrix.distro}}_devel
38+
- name: Build project
39+
run: make --directory=ci riscv64_${{matrix.distro}}_build
40+
- name: Test project
41+
run: make --directory=ci riscv64_${{matrix.distro}}_test
4242

43-
- name: Build install env image
44-
run: make --directory=ci riscv64_${{matrix.distro}}_install_env
45-
- name: Build install devel project
46-
run: make --directory=ci riscv64_${{matrix.distro}}_install_devel
47-
- name: Build install project
48-
run: make --directory=ci riscv64_${{matrix.distro}}_install_build
49-
- name: Test install project
50-
run: make --directory=ci riscv64_${{matrix.distro}}_install_test
43+
- name: Build install env image
44+
run: make --directory=ci riscv64_${{matrix.distro}}_install_env
45+
- name: Build install devel project
46+
run: make --directory=ci riscv64_${{matrix.distro}}_install_devel
47+
- name: Build install project
48+
run: make --directory=ci riscv64_${{matrix.distro}}_install_build
49+
- name: Test install project
50+
run: make --directory=ci riscv64_${{matrix.distro}}_install_test
51+
52+
riscv64_docker_cmake:
53+
runs-on: ubuntu-latest
54+
needs: docker
55+
steps:
56+
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)