From 21940983b22e75d43b943b384afb8d9c5eb83ab1 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Sat, 4 Jan 2025 16:17:57 +0000
Subject: [PATCH] troubleshoot ci

---
 .github/workflows/test.yml | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e9d309a..ee8a3d6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,10 +35,9 @@ jobs:
           - os: ubuntu-latest
             arch: amd64
             cgo: 1
-          # disable macOS as we can no longer load macfuse
-          # - os: macos-10.15
-          #   arch: amd64
-          #   cgo: 1
+          - os: macos-latest
+            arch: amd64
+            cgo: 1
       fail-fast: false
 
     steps:
@@ -91,8 +90,8 @@ jobs:
           rm -rf secfs.test/fstest/fstest/tests/xacl
           rm -rf secfs.test/fstest/fstest/tests/zzz_ResourceFork
 
-      - name: Install FUSE and secfs.test (macOS)
-        if: runner.os == 'macOS'
+      - name: Install FUSE and secfs.test (macOS disabled)
+        if: false && runner.os == 'macOS'
         run: |
           brew install macfuse
 
@@ -114,17 +113,18 @@ jobs:
           rm -rf secfs.test/fstest/fstest/tests/xacl
           rm -rf secfs.test/fstest/fstest/tests/zzz_ResourceFork
 
-      - name: Build/test packages with FUSE2
+      - name: Build packages with FUSE2
         run: |
           go build -v -o . ./...
           go build -tags=memfs3 -v -o memfs3${{ matrix.exe }} ./examples/memfs
-          go test -v -count=1 ./fuse
 
       - name: Test file systems with FUSE2 (Windows)
         if: runner.os == 'Windows'
         run: |
           Set-PSDebug -Trace 1
 
+          go test -v -count=1 ./fuse
+
           $testexe = (Get-Item winfsp-tests\winfsp-tests-x64.exe)
 
           Start-Process -NoNewWindow .\memfs.exe "-o uid=-1,rellinks,FileInfoTimeout=-1 X:"
@@ -151,11 +151,13 @@ jobs:
           Start-Sleep 3
           Pop-Location
 
-      - name: Test file systems (Linux / macOS) with FUSE2
-        if: runner.os == 'Linux' || runner.os == 'macOS'
+      - name: Test file systems (Linux / macOS disabled) with FUSE2
+        if: runner.os == 'Linux' || (false && runner.os == 'macOS')
         run: |
           set -x
 
+          go test -v -count=1 ./fuse
+
           mkdir p mnt
 
           sudo ./memfs -o allow_other,default_permissions,use_ino,attr_timeout=0 mnt &
@@ -186,13 +188,14 @@ jobs:
         run: |
           go build -tags=fuse3 -v -o . ./...
           go build -tags=fuse3,memfs3 -v -o memfs3${{ matrix.exe }} ./examples/memfs
-          go test -tags=fuse3 -v -count=1 ./fuse
 
       - name: Test file systems with FUSE3 (Linux)
         if: runner.os == 'Linux'
         run: |
           set -x
 
+          go test -tags=fuse3 -v -count=1 ./fuse
+
           mkdir p mnt
 
           sudo ./memfs -o allow_other,default_permissions,attr_timeout=0 mnt &