Skip to content

Commit

Permalink
Merge branch 'port-move-operator' of https://github.com/observIQ/stanza
Browse files Browse the repository at this point in the history
… into port-move-operator
  • Loading branch information
Mrod1598 committed Apr 16, 2021
2 parents dc9f862 + 11ccb3a commit c6a3eba
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ orbs:
executors:
golang:
docker:
- image: circleci/golang:1.14
- image: circleci/golang:1.16
mac:
macos:
xcode: 11.4.1
Expand Down Expand Up @@ -107,10 +107,10 @@ jobs:
- checkout
- run:
name: Download golang
command: curl -SL https://dl.google.com/go/go1.14.4.darwin-amd64.tar.gz -O
command: curl -SL https://golang.org/dl/go1.16.3.darwin-amd64.tar.gz -O
- run:
name: Extract golang
command: tar -C ~ -xzf go1.14.4.darwin-amd64.tar.gz
command: tar -C ~ -xzf go1.16.3.darwin-amd64.tar.gz
- run:
name: Add Golang to Path
command: echo 'export PATH=~/go/bin:$PATH' >> $BASH_ENV
Expand All @@ -126,7 +126,7 @@ jobs:
- run:
name: Upgrade Golang
shell: powershell.exe
command: choco upgrade golang --version=1.14
command: choco upgrade golang --version=1.16
- run:
name: Install GCC
shell: powershell.exe
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
default: 128GB

docker:
- image: circleci/golang:1.14
- image: circleci/golang:1.16
resource_class: small

steps:
Expand Down Expand Up @@ -276,7 +276,7 @@ jobs:

report-benchmark:
docker:
- image: circleci/golang:1.14
- image: circleci/golang:1.16
resource_class: small
steps:
- checkout
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added float64 to Severity parser's supported types [PR 267](https://github.com/observIQ/stanza/issues/267)
- Added move operator from Open-Telementry

### Changed
- Switched to Go 1.16, from Go 1.14

## [0.13.18] - 2021-04-02

### Changed
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ ALL_MODULES := $(shell find . -type f -name "go.mod" -exec dirname {} \; | sort

.PHONY: install-tools
install-tools:
go install github.com/golangci/golangci-lint/cmd/golangci-lint
go install github.com/vektra/mockery/cmd/mockery
go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
go install github.com/vektra/mockery/cmd/mockery@latest

.PHONY: test
test: vet test-only
Expand Down

0 comments on commit c6a3eba

Please sign in to comment.