Browse Source

Fix build break

Shelikhoo 6 years ago
parent
commit
c096ee0a81
3 changed files with 9 additions and 7 deletions
  1. 1 1
      azure-pipelines.yml
  2. 2 2
      core.go
  3. 6 4
      infra/bazel/build.bzl

+ 1 - 1
azure-pipelines.yml

@@ -94,7 +94,7 @@ jobs:
     displayName: 'Install Bazel'
   - script: |
       cd ./src/v2ray.com/core
-      $HOME/bin/bazel build --action_env=GOPATH=$GOPATH --action_env=PATH=$PATH --action_env=GPG_PASS=${SIGN_KEY_PASS} //release:all
+      $HOME/bin/bazel build --action_env=GOPATH=$GOPATH --action_env=PATH=$PATH --action_env=GPG_PASS=${SIGN_KEY_PASS} --action_env=SPWD=$PWD //release:all
     workingDirectory: '$(GOPATH)'
     displayName: 'Build Binaries'
   - script: |

+ 2 - 2
core.go

@@ -17,9 +17,9 @@ import (
 )
 
 const (
-	version  = "4.19"
+	version  = "4.20"
 	build    = "Custom"
-	codename = "Po"
+	codename = "Let's Fly"
 	intro    = "A unified platform for anti-censorship."
 )
 

+ 6 - 4
infra/bazel/build.bzl

@@ -28,10 +28,10 @@ def _go_command(ctx):
     "CGO_ENABLED=0",
     "GOOS="+ctx.attr.os,
     "GOARCH="+ctx.attr.arch,
-    "GOROOT_FINAL=/go",
-    "GOCACHE=@D",
+    #"GOROOT_FINAL=/go",
+    "GO111MODULE=on",
   ]
-  
+
   if ctx.attr.mips: # https://github.com/golang/go/issues/27260
     envs+=["GOMIPS="+ctx.attr.mips]
     envs+=["GOMIPS64="+ctx.attr.mips]
@@ -40,7 +40,9 @@ def _go_command(ctx):
   if ctx.attr.arm:
     envs+=["GOARM="+ctx.attr.arm]
 
-  command = " ".join(envs) + " " + command
+  switchToPwd="cd ${SPWD} && "
+
+  command = switchToPwd + " ".join(envs) + " " + command
 
   ctx.actions.run_shell(
     outputs = [output_file],