Skip to content

Commit e57276d

Browse files
committed
Fix CI Runners
1 parent a7fa7ee commit e57276d

8 files changed

Lines changed: 49 additions & 31 deletions

File tree

.github/workflows/pr-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ jobs:
8484
- "afp macgarden macip"
8585
- "afp sqlite_cnid"
8686
- "all"
87+
- "ipx netbeui smb"
8788
steps:
8889
- name: Checkout
8990
uses: actions/checkout@v4

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,5 @@ go.work.sum
4242
.macgarden/
4343

4444
.captures/
45-
captures/
45+
captures/
46+
classicstack

.golangci.yml

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,24 @@ linters:
1717
- revive
1818
- staticcheck
1919
- unused
20-
21-
linters-settings:
22-
errorlint:
23-
errorf: true
24-
asserts: true
25-
comparison: true
26-
revive:
20+
settings:
21+
errorlint:
22+
errorf: true
23+
asserts: true
24+
comparison: true
25+
revive:
26+
rules:
27+
- name: var-naming
28+
- name: package-comments
29+
- name: exported
30+
disabled: true
31+
gocritic:
32+
disabled-checks:
33+
- ifElseChain
34+
- singleCaseSwitch
35+
exclusions:
2736
rules:
28-
- name: var-naming
29-
- name: package-comments
30-
- name: exported
31-
disabled: true
32-
gocritic:
33-
disabled-checks:
34-
- ifElseChain
35-
- singleCaseSwitch
36-
37-
issues:
38-
exclude-rules:
39-
- path: _test\.go$
40-
linters:
41-
- errcheck
42-
- revive
37+
- path: _test\.go$
38+
linters:
39+
- errcheck
40+
- revive

classicstack

-20.6 MB
Binary file not shown.

scripts/ci/test.ps1

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,24 @@
11
$ErrorActionPreference = 'Stop'
22

3-
$packages = go list ./... | Where-Object { $_ -notmatch '(^|/)(dist|icon|icons)($|/)' }
4-
if (-not $packages) {
5-
throw 'No packages found to test'
6-
}
3+
$tagSets = @(
4+
''
5+
'afp'
6+
'afp macgarden'
7+
'afp macip'
8+
'afp macgarden macip'
9+
'afp sqlite_cnid'
10+
'all'
11+
'ipx netbeui smb'
12+
)
713

8-
go test $packages
14+
foreach ($tags in $tagSets) {
15+
Write-Host "=== go test -tags `"$tags`" ==="
16+
$packages = & go list -tags $tags ./... | Where-Object { $_ -notmatch '(^|/)(dist|icon|icons)($|/)' }
17+
if (-not $packages) {
18+
throw "No packages found to test for tags=`"$tags`""
19+
}
20+
& go test -tags $tags $packages
21+
if ($LASTEXITCODE -ne 0) {
22+
throw "go test failed for tags=`"$tags`""
23+
}
24+
}

scripts/ci/test.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ tag_sets=(
1212
"afp macgarden macip"
1313
"afp sqlite_cnid"
1414
"all"
15+
"ipx netbeui smb"
1516
)
1617

1718
for tags in "${tag_sets[@]}"; do

service/afp/macgarden_fs.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build macgarden
1+
//go:build (afp && macgarden) || all
22

33
package afp
44

@@ -17,6 +17,7 @@ import (
1717
"unicode"
1818

1919
"github.com/ObsoleteMadness/ClassicStack/netlog"
20+
"github.com/ObsoleteMadness/ClassicStack/pkg/vfs"
2021
garden "github.com/ObsoleteMadness/ClassicStack/service/macgarden"
2122
)
2223

service/afp/macgarden_fs_stub.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//go:build afp && !macgarden
1+
//go:build (afp || all) && !macgarden && !all
22

33
package afp
44

@@ -11,7 +11,7 @@ import (
1111
var ErrMacGardenDisabled = errors.New("macgarden backend not built; rebuild with -tags macgarden")
1212

1313
func init() {
14-
RegisterFS(FSTypeMacGarden, func(_ VolumeConfig) (FileSystem, error) {
14+
RegisterFS(FSTypeMacGarden, func(_ VolumeConfig, _ Options) (FileSystem, error) {
1515
return nil, ErrMacGardenDisabled
1616
})
1717
}

0 commit comments

Comments
 (0)