Revert "Build: Save build artifact and publish release (#2633)"

.circleci/config.yml

@@ -12,12 +12,9 @@ jobs:
      steps:
        - checkout
        - run: ci/do_circle_ci.sh bazel.release
-       - run: ci/do_circle_ci.sh github_release
        - setup_remote_docker
        - run: ci/docker_push.sh
        - run: ci/docker_tag.sh
-       - store_artifacts:
-          path: /tmp/envoy-dist
    asan:
      docker:
        - image: *envoy-build-image

ci/do_ci.sh

@@ -20,11 +20,9 @@ function bazel_release_binary_build() {
   # TODO(mattklein123): Replace this with caching and a different job which creates images.
   echo "Copying release binary for image build..."
   mkdir -p "${ENVOY_SRCDIR}"/build_release
-  mkdir -p /tmp/envoy-dist
   cp -f "${ENVOY_DELIVERY_DIR}"/envoy "${ENVOY_SRCDIR}"/build_release
   mkdir -p "${ENVOY_SRCDIR}"/build_release_stripped
   strip "${ENVOY_DELIVERY_DIR}"/envoy -o "${ENVOY_SRCDIR}"/build_release_stripped/envoy
-  cp "${ENVOY_SRCDIR}"/build_release_stripped/envoy /tmp/envoy-dist/envoy
 }
 
 function bazel_debug_binary_build() {
@@ -39,6 +37,14 @@ function bazel_debug_binary_build() {
 }
 
 if [[ "$1" == "bazel.release" ]]; then
+  # The release build step still runs during tag events. Avoid rebuilding for no reason.
+  # TODO(mattklein123): Consider moving this into its own "build".
+  if [[ -n "$CIRCLE_TAG" ]]
+  then
+    echo 'Ignoring build for git tag event'
+    exit 0
+  fi
+
   setup_gcc_toolchain
   echo "bazel release build with tests..."
   bazel_release_binary_build
@@ -161,8 +167,6 @@ elif [[ "$1" == "check_format" ]]; then
 elif [[ "$1" == "docs" ]]; then
   docs/publish.sh
   exit 0
-elif [[ "$1" == "github_release" ]]; then
-  ./ci/publish_github_release.sh
 else
   echo "Invalid do_ci.sh target, see ci/README.md for valid targets."
   exit 1

ci/do_circle_ci.sh

@@ -2,11 +2,9 @@
 
 set -e
 
-if [[ -f ~/.gitconfig ]]; then
-  # bazel uses jgit internally and the default circle-ci .gitconfig says to
-  # convert https://github.com to ssh://git@github.com, which jgit does not support.
-  mv ~/.gitconfig ~/.gitconfig_save
-fi
+# bazel uses jgit internally and the default circle-ci .gitconfig says to
+# convert https://github.com to ssh://git@github.com, which jgit does not support.
+mv ~/.gitconfig ~/.gitconfig_save
 
 export ENVOY_SRCDIR="$(pwd)"