add test for non macos and fix a bug

.github/workflows/test_release.yml

@@ -7,10 +7,8 @@ jobs:
   test:
     runs-on: macos-latest
     steps:
-    - name: checkout
-      uses: actions/checkout@v3
-    - name: set up go
-      uses: actions/setup-go@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-go@v5
       with:
         go-version-file: "go.mod"
     - name: lint
@@ -21,18 +19,32 @@ jobs:
         sw_vers
         make test
         make test-large-file
+  test_on_non_macos:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-go@v5
+      with:
+        go-version-file: "go.mod"
+    - name: test
+      shell: bash
+      run: |
+        make test-on-non-macos
+
+
   release:
     runs-on: macos-latest
     name: goreleaser
-    needs: [test]
+    needs: [test, test_on_non_macos]
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
-    - name: checkout
-      uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - name: set up go
-      uses: actions/setup-go@v3
+    - uses: actions/setup-go@v5
       with:
         go-version-file: "go.mod"
     - name: Run GoReleaser

Makefile

@@ -21,6 +21,9 @@ test:
 test-large-file:
 	./test-large-file.sh
 
+test-on-non-macos:
+	./test-on-non-macos.sh
+
 cover:
 	go test -coverpkg=./... -coverprofile=cover.out ./...
 	go tool cover -html=cover.out -o cover.html

pkg/lipo/thin.go

@@ -63,7 +63,7 @@ func (l *Lipo) thin(perm os.FileMode, fatArch lmacho.FatArch) error {
 	}
 
 	// close before rename
-	if err := r.Close(); err != nil {
+	if err := out.Close(); err != nil {
 		return err
 	}
 

test-large-file.sh

@@ -2,19 +2,19 @@
 
 set -eu
 
-ARM64_FILE="./arm64"
-AMD64_FILE="./amd64"
+ARM64_FILE="./bin/arm64"
+AMD64_FILE="./bin/amd64"
 ARM64_LARGE_FILE=$ARM64_FILE.large
 AMD64_LARGE_FILE=$AMD64_FILE.large
 
 if [ ! -f $ARM64_FILE ]; then
     echo creating ARM64_FILE
-    CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -o arm64 example/main.go
+    CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -o $ARM64_FILE example/main.go
 fi
 
 if [ ! -f $AMD64_FILE ]; then
     echo creating AMD64_FILE
-    CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o amd64 example/main.go
+    CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o $AMD64_FILE example/main.go
 fi
 
 if [ ! -f large-data ]; then

test-on-non-macos.sh

@@ -0,0 +1,33 @@
+#!/bin/sh
+# https://github.com/actions/runner-images/issues/7253
+
+set -eu
+
+FAT_BIN=./bin/fat
+ARM64_BIN=./bin/arm64
+AMD64_BIN=./bin/amd64
+EXTRACT_BIN=./bin/extract
+THIB_BIN=./bin/thin
+LIPO_BIN=./bin/lipo
+
+echo "====building lipo binary"
+make
+echo "====building base binaries"
+CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o bin/amd64 example/main.go
+CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -o bin/arm64 example/main.go
+
+echo "====creating fat"
+$LIPO_BIN -output $FAT_BIN -create $ARM64_BIN $AMD64_BIN
+$LIPO_BIN $FAT_BIN -verify_arch x86_64 arm64
+
+echo "====extracting arm64"
+$LIPO_BIN -extract arm64 -output $EXTRACT_BIN $FAT_BIN
+$LIPO_BIN $EXTRACT_BIN -verify_arch arm64
+
+echo "====thin"
+$LIPO_BIN -thin arm64 -output $THIB_BIN $FAT_BIN
+$LIPO_BIN $THIB_BIN -verify_arch arm64
+
+echo "===replace TODO"
+
+echo all test pass!