Bläddra i källkod

change goproxy to direct

ffdfgdfg 5 år sedan
förälder
incheckning
40489de7f7
4 ändrade filer med 6 tillägg och 3 borttagningar
  1. 1 1
      .travis.yml
  2. 1 0
      Dockerfile.npc
  3. 1 0
      Dockerfile.nps
  4. 3 2
      build.sh

+ 1 - 1
.travis.yml

@@ -6,7 +6,7 @@ go:
 services:
   - docker
 script:
-  - go test -v ./cmd/nps/
+  - GOPROXY=direct go test -v ./cmd/nps/
 os:
   - linux
 before_deploy:

+ 1 - 0
Dockerfile.npc

@@ -1,4 +1,5 @@
 FROM golang:1.13.8 as builder
+ARG GOPROXY=direct
 WORKDIR /go/src/ehang.io/nps
 COPY . .
 RUN go get -d -v ./... 

+ 1 - 0
Dockerfile.nps

@@ -1,4 +1,5 @@
 FROM golang:1.13.8 as builder
+ARG GOPROXY=direct
 WORKDIR /go/src/ehang.io/nps
 COPY . .
 RUN go get -d -v ./... 

+ 3 - 2
build.sh

@@ -1,5 +1,6 @@
 #/bash/sh
 export VERSION=0.26.5
+export GOPROXY=direct
 
 sudo apt-get install gcc-mingw-w64-i686 gcc-multilib
 env GOOS=windows GOARCH=386 CGO_ENABLED=1 CC=i686-w64-mingw32-gcc go build -ldflags "-s -w -extldflags -static -extldflags -static" -buildmode=c-shared -o npc_sdk.dll cmd/npc/sdk.go
@@ -164,10 +165,10 @@ sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubun
 sudo apt-get update
 sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
 docker --version
-docker run --rm -i -w /app -v $(pwd):/app -e ANDROID_HOME=/usr/local/android_sdk ffdfgdfg/fyne-cross:android /app/build.android.sh
+docker run --rm -i -w /app -v $(pwd):/app -e ANDROID_HOME=/usr/local/android_sdk -e GOPROXY=direct ffdfgdfg/fyne-cross:android /app/build.android.sh
 git clone https://github.com/cnlh/spksrc.git ~/spksrc
 mkdir ~/spksrc/nps && cp -rf ./* ~/spksrc/nps/
-docker run -itd --name spksrc --env VERSION=$VERSION  -v ~/spksrc:/spksrc synocommunity/spksrc /bin/bash
+docker run -itd --name spksrc --env VERSION=$VERSION -e GOPROXY=direct -v ~/spksrc:/spksrc synocommunity/spksrc /bin/bash
 docker exec -it spksrc /bin/bash -c 'cd /spksrc && make setup && cd /spksrc/spk/npc && make'
 cp ~/spksrc/packages/npc_noarch-all_$VERSION-1.spk ./npc_syno.spk