Skip to content

Commit ce5b4f6

Browse files
author
neil
committed
refactor
1 parent 1f5aa94 commit ce5b4f6

File tree

10 files changed

+74
-94
lines changed

10 files changed

+74
-94
lines changed

.github/workflows/dragonflybsd.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ on:
1111
paths:
1212
- '**.py'
1313
- '.github/workflows/dragonflybsd.yml'
14-
- '.github/workflows/nfs.yml'
15-
- '.github/workflows/sshfs.yml'
14+
- '.github/workflows/testrun.yml'
15+
1616

1717
concurrency:
1818
group: ${{ github.workflow }}-${{ github.ref }}
@@ -28,12 +28,13 @@ jobs:
2828
runs: ["ubuntu-24.04"]
2929

3030

31-
uses: ./.github/workflows/nfs.yml
31+
uses: ./.github/workflows/testrun.yml
3232
with:
3333
runs: ${{ matrix.runs }}
3434
os: dragonflybsd
3535
release: ${{ matrix.release }}
3636
arch: ${{ matrix.arch }}
37+
sync: "nfs"
3738

3839

3940

.github/workflows/freebsd.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ on:
1111
paths:
1212
- '**.py'
1313
- '.github/workflows/freebsd.yml'
14-
- '.github/workflows/nfs.yml'
15-
- '.github/workflows/sshfs.yml'
14+
- '.github/workflows/testrun.yml'
15+
16+
1617

1718
concurrency:
1819
group: ${{ github.workflow }}-${{ github.ref }}
@@ -28,12 +29,13 @@ jobs:
2829
runs: ["ubuntu-24.04"]
2930

3031

31-
uses: ./.github/workflows/sshfs.yml
32+
uses: ./.github/workflows/testrun.yml
3233
with:
3334
runs: ${{ matrix.runs }}
3435
os: freebsd
3536
release: ${{ matrix.release }}
3637
arch: ${{ matrix.arch }}
38+
sync: "sshfs"
3739

3840

3941
testnfs:
@@ -51,10 +53,11 @@ jobs:
5153
- release: 14.0
5254
arch: aarch64
5355

54-
uses: ./.github/workflows/nfs.yml
56+
uses: ./.github/workflows/testrun.yml
5557
with:
5658
runs: ${{ matrix.runs }}
5759
os: freebsd
5860
release: ${{ matrix.release }}
5961
arch: ${{ matrix.arch }}
62+
sync: nfs
6063

.github/workflows/netbsd.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ on:
1111
paths:
1212
- '**.py'
1313
- '.github/workflows/netbsd.yml'
14-
- '.github/workflows/nfs.yml'
15-
- '.github/workflows/sshfs.yml'
14+
- '.github/workflows/testrun.yml'
15+
16+
1617

1718
concurrency:
1819
group: ${{ github.workflow }}-${{ github.ref }}
@@ -38,12 +39,13 @@ jobs:
3839
- release: "9.4"
3940
arch: aarch64
4041

41-
uses: ./.github/workflows/sshfs.yml
42+
uses: ./.github/workflows/testrun.yml
4243
with:
4344
runs: ${{ matrix.runs }}
4445
os: netbsd
4546
release: ${{ matrix.release }}
4647
arch: ${{ matrix.arch }}
48+
sync: "sshfs"
4749

4850

4951
testnfs:
@@ -65,10 +67,11 @@ jobs:
6567
- release: "9.4"
6668
arch: aarch64
6769

68-
uses: ./.github/workflows/nfs.yml
70+
uses: ./.github/workflows/testrun.yml
6971
with:
7072
runs: ${{ matrix.runs }}
7173
os: netbsd
7274
release: ${{ matrix.release }}
7375
arch: ${{ matrix.arch }}
76+
sync: "nfs"
7477

.github/workflows/omnios.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ on:
1111
paths:
1212
- '**.py'
1313
- '.github/workflows/omnios.yml'
14-
- '.github/workflows/nfs.yml'
15-
- '.github/workflows/sshfs.yml'
14+
- '.github/workflows/testrun.yml'
15+
16+
1617

1718
concurrency:
1819
group: ${{ github.workflow }}-${{ github.ref }}
@@ -28,12 +29,13 @@ jobs:
2829
runs: ["ubuntu-24.04"]
2930

3031

31-
uses: ./.github/workflows/nfs.yml
32+
uses: ./.github/workflows/testrun.yml
3233
with:
3334
runs: ${{ matrix.runs }}
3435
os: omnios
3536
release: ${{ matrix.release }}
3637
arch: ${{ matrix.arch }}
38+
sync: "nfs"
3739

3840

3941

.github/workflows/openbsd.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ on:
1111
paths:
1212
- '**.py'
1313
- '.github/workflows/openbsd.yml'
14-
- '.github/workflows/nfs.yml'
15-
- '.github/workflows/sshfs.yml'
14+
- '.github/workflows/testrun.yml'
15+
1616

1717
concurrency:
1818
group: ${{ github.workflow }}-${{ github.ref }}
@@ -31,12 +31,13 @@ jobs:
3131
arch: aarch64
3232

3333

34-
uses: ./.github/workflows/sshfs.yml
34+
uses: ./.github/workflows/testrun.yml
3535
with:
3636
runs: ${{ matrix.runs }}
3737
os: openbsd
3838
release: ${{ matrix.release }}
3939
arch: ${{ matrix.arch }}
40+
sync: "sshfs"
4041

4142

4243
testnfs-old:
@@ -50,12 +51,13 @@ jobs:
5051
- release: 7.3
5152
arch: aarch64
5253

53-
uses: ./.github/workflows/nfs.yml
54+
uses: ./.github/workflows/testrun.yml
5455
with:
5556
runs: ${{ matrix.runs }}
5657
os: openbsd
5758
release: ${{ matrix.release }}
5859
arch: ${{ matrix.arch }}
60+
sync: "nfs"
5961

6062

6163
testsshfs:
@@ -66,12 +68,13 @@ jobs:
6668
arch: ["aarch64", ""]
6769
runs: ["ubuntu-24.04"]
6870

69-
uses: ./.github/workflows/sshfs.yml
71+
uses: ./.github/workflows/testrun.yml
7072
with:
7173
runs: ${{ matrix.runs }}
7274
os: openbsd
7375
release: ${{ matrix.release }}
7476
arch: ${{ matrix.arch }}
77+
sync: "sshfs"
7578

7679
testnfs:
7780
strategy:
@@ -81,9 +84,11 @@ jobs:
8184
arch: ["aarch64", ""]
8285
runs: ["ubuntu-24.04"]
8386

84-
uses: ./.github/workflows/nfs.yml
87+
uses: ./.github/workflows/testrun.yml
8588
with:
8689
runs: ${{ matrix.runs }}
8790
os: openbsd
8891
release: ${{ matrix.release }}
8992
arch: ${{ matrix.arch }}
93+
sync: "nfs"
94+

.github/workflows/openindiana.yml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,31 @@ on:
1111
paths:
1212
- '**.py'
1313
- '.github/workflows/openindiana.yml'
14-
- '.github/workflows/nfs.yml'
15-
- '.github/workflows/sshfs.yml'
14+
- '.github/workflows/testrun.yml'
15+
1616

1717
concurrency:
1818
group: ${{ github.workflow }}-${{ github.ref }}
1919
cancel-in-progress: true
2020

2121
jobs:
22+
testsshfs:
23+
strategy:
24+
fail-fast: false
25+
matrix:
26+
release: ["202510"]
27+
arch: [""]
28+
runs: ["ubuntu-24.04"]
29+
30+
31+
uses: ./.github/workflows/testrun.yml
32+
with:
33+
runs: ${{ matrix.runs }}
34+
os: freebsd
35+
release: ${{ matrix.release }}
36+
arch: ${{ matrix.arch }}
37+
sync: "sshfs"
38+
2239
nfs:
2340
strategy:
2441
fail-fast: false
@@ -28,12 +45,13 @@ jobs:
2845
runs: ["ubuntu-24.04"]
2946

3047

31-
uses: ./.github/workflows/nfs.yml
48+
uses: ./.github/workflows/testrun.yml
3249
with:
3350
runs: ${{ matrix.runs }}
3451
os: openindiana
3552
release: ${{ matrix.release }}
3653
arch: ${{ matrix.arch }}
54+
sync: "nfs"
3755

3856

3957

.github/workflows/solaris.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ on:
1111
paths:
1212
- '**.py'
1313
- '.github/workflows/solaris.yml'
14-
- '.github/workflows/nfs.yml'
15-
- '.github/workflows/sshfs.yml'
14+
- '.github/workflows/testrun.yml'
15+
1616

1717
concurrency:
1818
group: ${{ github.workflow }}-${{ github.ref }}
@@ -28,12 +28,13 @@ jobs:
2828
runs: ["ubuntu-24.04"]
2929

3030

31-
uses: ./.github/workflows/nfs.yml
31+
uses: ./.github/workflows/testrun.yml
3232
with:
3333
runs: ${{ matrix.runs }}
3434
os: solaris
3535
release: ${{ matrix.release }}
3636
arch: ${{ matrix.arch }}
37+
sync: nfs
3738

3839

3940

.github/workflows/sshfs.yml

Lines changed: 0 additions & 62 deletions
This file was deleted.

.github/workflows/test.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ on:
1111
paths:
1212
- '**.py'
1313
- '.github/workflows/test.yml'
14-
- '.github/workflows/nfs.yml'
15-
- '.github/workflows/sshfs.yml'
14+
- '.github/workflows/testrun.yml'
1615

1716
concurrency:
1817
group: ${{ github.workflow }}-${{ github.ref }}
@@ -27,11 +26,12 @@ jobs:
2726
arch: ["aarch64", ""]
2827
runs: ["ubuntu-24.04"]
2928

30-
uses: ./.github/workflows/sshfs.yml
29+
uses: ./.github/workflows/testrun.yml
3130
with:
3231
runs: ${{ matrix.runs }}
3332
os: ${{ matrix.os }}
3433
arch: ${{ matrix.arch }}
34+
sync: sshfs
3535

3636
testnfs:
3737
strategy:
@@ -50,9 +50,10 @@ jobs:
5050
- os: openindiana
5151
arch: aarch64
5252

53-
uses: ./.github/workflows/nfs.yml
53+
uses: ./.github/workflows/testrun.yml
5454
with:
5555
runs: ${{ matrix.runs }}
5656
os: ${{ matrix.os }}
5757
arch: ${{ matrix.arch }}
58+
sync: nfs
5859

0 commit comments

Comments
 (0)