diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index c91937c6..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) HashiCorp, Inc. -# SPDX-License-Identifier: MPL-2.0 - -version: 2.1 -jobs: - build: - resource_class: large - machine: - image: 'ubuntu-2004:202107-02' - working_directory: ~/terraform-provider-watchtower - steps: - - checkout - - run: - name: "Install go" - command: | - unset GOPATH # ci image has done strange things with GOPATH, unset it so install-go can fix it - make install-go - source ~/.bashrc - go mod download - - run: - name: "Run Acceptance Tests" - command: | - source ~/.bashrc - make testacc-ci diff --git a/Makefile b/Makefile index 8655c73b..d61056d0 100644 --- a/Makefile +++ b/Makefile @@ -34,15 +34,6 @@ test: testacc: TF_ACC=1 go test ./... -v $(TESTARGS) -timeout 120m -testacc-ci: - git config --global --add url."git@github.com:".insteadOf "https://github.com/" - TF_ACC=1 ~/.go/bin/go test ./... -v $(TESTARGS) -timeout 120m - -install-go: ~/.go/bin/go - -~/.go/bin/go: - ./ci/goinstall.sh - dev: GOOS=${GOOS} GOARCH=${GOARCH} ./scripts/plugins.sh mkdir -p $(INSTALL_PATH) diff --git a/ci/goinstall.sh b/ci/goinstall.sh deleted file mode 100755 index ba170ec3..00000000 --- a/ci/goinstall.sh +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/bash -# Copyright (c) HashiCorp, Inc. -# SPDX-License-Identifier: MPL-2.0 - -set -e - -VERSION="1.19.1" - -[ -z "$GOROOT" ] && GOROOT="$HOME/.go" -[ -z "$GOPATH" ] && GOPATH="$HOME/go" - -OS="$(uname -s)" -ARCH="$(uname -m)" - -case $OS in - "Linux") - case $ARCH in - "x86_64") - ARCH=amd64 - ;; - "aarch64") - ARCH=arm64 - ;; - "armv6") - ARCH=armv6l - ;; - "armv8") - ARCH=arm64 - ;; - .*386.*) - ARCH=386 - ;; - esac - PLATFORM="linux-$ARCH" - ;; - "Darwin") - PLATFORM="darwin-amd64" - ;; -esac - -print_help() { - echo "Usage: bash goinstall.sh OPTIONS" - echo -e "\nOPTIONS:" - echo -e " --remove\tRemove currently installed version" - echo -e " --version\tSpecify a version number to install" -} - -if [ -n "`$SHELL -c 'echo $ZSH_VERSION'`" ]; then - shell_profile="zshrc" -elif [ -n "`$SHELL -c 'echo $BASH_VERSION'`" ]; then - shell_profile="bashrc" -fi - -if [ "$1" == "--remove" ]; then - rm -rf "$GOROOT" - if [ "$OS" == "Darwin" ]; then - sed -i "" '/# GoLang/d' "$HOME/.${shell_profile}" - sed -i "" '/export GOROOT/d' "$HOME/.${shell_profile}" - sed -i "" '/$GOROOT\/bin/d' "$HOME/.${shell_profile}" - sed -i "" '/export GOPATH/d' "$HOME/.${shell_profile}" - sed -i "" '/$GOPATH\/bin/d' "$HOME/.${shell_profile}" - else - sed -i '/# GoLang/d' "$HOME/.${shell_profile}" - sed -i '/export GOROOT/d' "$HOME/.${shell_profile}" - sed -i '/$GOROOT\/bin/d' "$HOME/.${shell_profile}" - sed -i '/export GOPATH/d' "$HOME/.${shell_profile}" - sed -i '/$GOPATH\/bin/d' "$HOME/.${shell_profile}" - fi - echo "Go removed." - exit 0 -elif [ "$1" == "--help" ]; then - print_help - exit 0 -elif [ "$1" == "--version" ]; then - if [ -z "$2" ]; then # Check if --version has a second positional parameter - echo "Please provide a version number for: $1" - else - VERSION=$2 - fi -elif [ ! -z "$1" ]; then - echo "Unrecognized option: $1" - exit 1 -fi - -if [ -d "$GOROOT" ]; then - echo "The Go install directory ($GOROOT) already exists. Exiting." - exit 1 -fi - -PACKAGE_NAME="go$VERSION.$PLATFORM.tar.gz" -TEMP_DIRECTORY=$(mktemp -d) - -echo "Downloading $PACKAGE_NAME ..." -if hash wget 2>/dev/null; then - wget https://storage.googleapis.com/golang/$PACKAGE_NAME -O "$TEMP_DIRECTORY/go.tar.gz" -else - curl -o "$TEMP_DIRECTORY/go.tar.gz" https://storage.googleapis.com/golang/$PACKAGE_NAME -fi - -if [ $? -ne 0 ]; then - echo "Download failed! Exiting." - exit 1 -fi - -echo "Extracting File..." -mkdir -p "$GOROOT" -tar -C "$GOROOT" --strip-components=1 -xzf "$TEMP_DIRECTORY/go.tar.gz" -touch "$HOME/.${shell_profile}" -{ - echo '# GoLang' - echo "export GOROOT=${GOROOT}" - echo 'export PATH=$GOROOT/bin:$PATH' - echo "export GOPATH=$GOPATH" - echo 'export PATH=$GOPATH/bin:$PATH' -} >> "$HOME/.${shell_profile}" - -mkdir -p $GOPATH/{src,pkg,bin} -echo -e "\nGo $VERSION was installed into $GOROOT.\nMake sure to relogin into your shell or run:" -echo -e "\n\tsource $HOME/.${shell_profile}\n\nto update your environment variables." -echo "Tip: Opening a new terminal window usually just works. :)" -rm -f "$TEMP_DIRECTORY/go.tar.gz"