From 3539ae9c38c35ebc0ddae711b43004841b13d7b3 Mon Sep 17 00:00:00 2001 From: Darien Raymond Date: Sun, 10 Feb 2019 21:04:51 +0100 Subject: [PATCH] remove reference to ext/ --- azure-pipelines.template.yml | 1 - azure-pipelines.yml | 2 -- release/install.sh | 3 +-- release/make-release.sh | 7 ------- release/release-ci.sh | 1 - 5 files changed, 1 insertion(+), 13 deletions(-) diff --git a/azure-pipelines.template.yml b/azure-pipelines.template.yml index 051b24be..377ce788 100644 --- a/azure-pipelines.template.yml +++ b/azure-pipelines.template.yml @@ -17,7 +17,6 @@ jobs: - script: | go version go get -v -t -d v2ray.com/core/... - go get -v -t -d v2ray.com/ext/... go get -u github.com/jstemmer/go-junit-report workingDirectory: '$(system.defaultWorkingDirectory)' displayName: 'Fetch sources' diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fe0e71c4..467973c1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -42,7 +42,6 @@ jobs: - script: | go version go get -v -t -d v2ray.com/core/... - go get -v -t -d v2ray.com/ext/... workingDirectory: '$(system.defaultWorkingDirectory)' displayName: 'Fetch sources' - script: | @@ -75,7 +74,6 @@ jobs: - script: | go version go get -v -t -d v2ray.com/core/... - go get -v -t -d v2ray.com/ext/... workingDirectory: '$(system.defaultWorkingDirectory)' displayName: 'Fetch sources' - script: | diff --git a/release/install.sh b/release/install.sh index 796e0dc3..1b7b3473 100755 --- a/release/install.sh +++ b/release/install.sh @@ -22,6 +22,5 @@ if [ -z "$GOPATH" ]; then fi go get -u v2ray.com/core/... -go get -u v2ray.com/ext/... go build -o $GOPATH/bin/v2ray v2ray.com/core/main -go build -o $GOPATH/bin/v2ctl v2ray.com/ext/tools/control/main +go build -o $GOPATH/bin/v2ctl v2ray.com/core/infra/control/main diff --git a/release/make-release.sh b/release/make-release.sh index 9d15d242..8e635a19 100755 --- a/release/make-release.sh +++ b/release/make-release.sh @@ -34,13 +34,6 @@ echo "Pushing changes" git push --follow-tags popd -pushd $GOPATH/src/v2ray.com/ext -echo "Adding a new tag: " "v$VER" "to ext" -git tag -s -a "v$VER" -m "Version ${VER}" -echo "Pushing changes to ext" -git push --follow-tags -popd - echo "Launching build machine." DIR="$(dirname "$0")" RAND="$(openssl rand -hex 5)" diff --git a/release/release-ci.sh b/release/release-ci.sh index 2c5c12d6..a92d1d96 100644 --- a/release/release-ci.sh +++ b/release/release-ci.sh @@ -47,7 +47,6 @@ export GOPATH=/v2 # Download all source code go get -t v2ray.com/core/... -go get -t v2ray.com/ext/... pushd $GOPATH/src/v2ray.com/core/ git checkout tags/${RELEASE_TAG}