Skip to content

Commit

Permalink
fix(ci): remove docker setup and use sudo to sed buggy go file
Browse files Browse the repository at this point in the history
  • Loading branch information
jjacque committed Jun 9, 2024
1 parent c14cfd3 commit 397d65f
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
if [ "${CPVER}" = "v0.3.0" ]
then
CPDIR="$(go list -m -json "github.com/hashicorp/go-secure-stdlib/plugincontainer"| jq -r '.Dir')"
sed -i 's@types\.Container@container.@g' "${CPDIR}/container_runner.go"
sudo sed -i 's@types\.Container@container.@g' "${CPDIR}/container_runner.go"
fi
- run:
name: Go fmt
Expand All @@ -39,15 +39,14 @@ jobs:
command: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.54.2
- run:
name: GolangCI Lint
command: golangci-lint run
command: golangci-lint run --timeout 300s
- save_cache: &save-cache
paths:
- /home/circleci/go/pkg/mod
key: go-mod-{{ checksum "go.sum" }}
test:
executor: golang
steps:
- setup_remote_docker
- checkout
- restore_cache:
<<: *restore-cache
Expand All @@ -59,13 +58,11 @@ jobs:
if [ "${CPVER}" = "v0.3.0" ]
then
CPDIR="$(go list -m -json "github.com/hashicorp/go-secure-stdlib/plugincontainer"| jq -r '.Dir')"
sed -i 's@types\.Container@container.@g' "${CPDIR}/container_runner.go"
sudo sed -i 's@types\.Container@container.@g' "${CPDIR}/container_runner.go"
fi
- run:
name: Test
command: |
env
unset DOCKER_MACHINE_NAME
make test
- save_cache:
<<: *save-cache
Expand Down

0 comments on commit 397d65f

Please sign in to comment.