Skip to content

Commit ae7eef7

Browse files
committed
ci: cleanup
1 parent 4e4c9b0 commit ae7eef7

File tree

2 files changed

+43
-33
lines changed

2 files changed

+43
-33
lines changed

.github/workflows/amd64_docker.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,22 @@ jobs:
3131
docker info
3232
docker buildx ls
3333
- name: Build env image
34-
run: make --directory=ci amd64_${{ matrix.distro }}_env
34+
run: make --directory=ci amd64_${{matrix.distro}}_env
3535
- name: Build devel project
36-
run: make --directory=ci amd64_${{ matrix.distro }}_devel
36+
run: make --directory=ci amd64_${{matrix.distro}}_devel
3737
- name: Build project
38-
run: make --directory=ci amd64_${{ matrix.distro }}_build
38+
run: make --directory=ci amd64_${{matrix.distro}}_build
3939
- name: Test project
40-
run: make --directory=ci amd64_${{ matrix.distro }}_test
40+
run: make --directory=ci amd64_${{matrix.distro}}_test
4141

4242
- name: Build install env image
43-
run: make --directory=ci amd64_${{ matrix.distro }}_install_env
43+
run: make --directory=ci amd64_${{matrix.distro}}_install_env
4444
- name: Build install devel project
45-
run: make --directory=ci amd64_${{ matrix.distro }}_install_devel
45+
run: make --directory=ci amd64_${{matrix.distro}}_install_devel
4646
- name: Build install project
47-
run: make --directory=ci amd64_${{ matrix.distro }}_install_build
47+
run: make --directory=ci amd64_${{matrix.distro}}_install_build
4848
- name: Test install project
49-
run: make --directory=ci amd64_${{ matrix.distro }}_install_test
49+
run: make --directory=ci amd64_${{matrix.distro}}_install_test
5050

5151
amd64_docker:
5252
runs-on: ubuntu-latest

.github/workflows/riscv64_docker.yml

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ name: riscv64 Docker
33

44
on: [push, pull_request, workflow_dispatch]
55

6+
concurrency:
7+
group: ${{github.workflow}}-${{github.ref}}
8+
cancel-in-progress: true
9+
610
jobs:
711
docker:
812
strategy:
@@ -14,33 +18,39 @@ jobs:
1418
# fedora,
1519
# opensuse,
1620
# rockylinux,
17-
#ubuntu,
21+
# ubuntu,
1822
]
1923
fail-fast: false
20-
name: riscv64${{ matrix.distro }}
24+
name: riscv64${{matrix.distro}}
2125
runs-on: ubuntu-latest
2226
steps:
23-
- uses: actions/checkout@v5
24-
- name: Set up QEMU
25-
uses: docker/setup-qemu-action@v3
26-
- name: Check docker
27-
run: |
28-
docker info
29-
docker buildx ls
30-
- name: Build env image
31-
run: make --directory=ci riscv64_${{ matrix.distro }}_env
32-
- name: Build devel project
33-
run: make --directory=ci riscv64_${{ matrix.distro }}_devel
34-
- name: Build project
35-
run: make --directory=ci riscv64_${{ matrix.distro }}_build
36-
- name: Test project
37-
run: make --directory=ci riscv64_${{ matrix.distro }}_test
27+
- uses: actions/checkout@v5
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
42+
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
3851

39-
- name: Build install env image
40-
run: make --directory=ci riscv64_${{ matrix.distro }}_install_env
41-
- name: Build install devel project
42-
run: make --directory=ci riscv64_${{ matrix.distro }}_install_devel
43-
- name: Build install project
44-
run: make --directory=ci riscv64_${{ matrix.distro }}_install_build
45-
- name: Test install project
46-
run: make --directory=ci riscv64_${{ matrix.distro }}_install_test
52+
riscv64_docker:
53+
runs-on: ubuntu-latest
54+
needs: docker
55+
steps:
56+
- uses: actions/checkout@v5

0 commit comments

Comments
 (0)