Просмотр исходного кода

Fix CI test for cgroupv1

The test binary is complied on ubuntu 22.04, linked with higher version
of glibc than debian bullseye integrates after upgrading to golang 1.22

Solve this problem by disabling cgo.
Miao Wang 11 месяцев назад
Родитель
Сommit
e903c644f2
2 измененных файлов с 3 добавлено и 2 удалено
  1. 1 0
      .github/workflows/tunasync.yml
  2. 2 2
      Makefile

+ 1 - 0
.github/workflows/tunasync.yml

@@ -190,6 +190,7 @@ jobs:
       run: |
         CUSER="$(id --user --name)"
         sudo rsh 254.255.255.2 bash --noprofile --norc -eo pipefail << EOF
+          exec 2>&1
           cd "/home/${CUSER}"
           lssubsys -am
           cgcreate -a "$CUSER" -t "$CUSER" -g cpu:tunasync

+ 2 - 2
Makefile

@@ -14,13 +14,13 @@ $(BUILDBIN): % : build-$(ARCH) build-$(ARCH)/%
 
 $(BUILDBIN:%=build-$(ARCH)/%) : build-$(ARCH)/% : cmd/%
 	GOOS=$(GOOS) GOARCH=$(GOARCH) go get ./$<
-	GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $@ -ldflags ${LDFLAGS} github.com/tuna/tunasync/$<
+	GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 go build -o $@ -ldflags ${LDFLAGS} github.com/tuna/tunasync/$<
 
 test:
 	go test -v -covermode=count -coverprofile=profile.cov ./...
 
 build-test-worker:
-	go test -c -covermode=count ./worker
+	CGO_ENABLED=0 go test -c -covermode=count ./worker
 
 clean:
 	rm -rf build-$(ARCH)