Skip to content

Commit

Permalink
Merge pull request #204 from resgateio/feature/gh-203-go-1.17.0
Browse files Browse the repository at this point in the history
Feature/gh 203 go 1.17.0
  • Loading branch information
jirenius committed Aug 26, 2021
2 parents 0068437 + 943a899 commit f003f70
Show file tree
Hide file tree
Showing 15 changed files with 436 additions and 230 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
@@ -1,15 +1,15 @@
language: go
go:
- 1.13.x
- 1.14.4
- 1.15.x
- 1.16.7
install:
- go get -t ./...
- ./scripts/install-checks.sh
before_script:
- if [[ "$TRAVIS_GO_VERSION" =~ ^1\.14(\.[0-9]+)?$ ]]; then ./scripts/check.sh; fi
- if [[ "$TRAVIS_GO_VERSION" =~ ^1\.16(\.[0-9]+)?$ ]]; then ./scripts/check.sh; fi
- go build
- if [[ "$TRAVIS_GO_VERSION" =~ ^1\.14(\.[0-9]+)?$ ]] && [ "$TRAVIS_TAG" != "" ]; then ./scripts/cross_compile.sh $TRAVIS_TAG; fi
- if [[ "$TRAVIS_GO_VERSION" =~ ^1\.16(\.[0-9]+)?$ ]] && [ "$TRAVIS_TAG" != "" ]; then ./scripts/cross_compile.sh $TRAVIS_TAG; fi
script:
- if [[ "$TRAVIS_GO_VERSION" =~ ^1\.14(\.[0-9]+)?$ ]]; then ./scripts/cover.sh TRAVIS; else go test -v -race $PACKAGES; fi
- if [[ "$TRAVIS_GO_VERSION" =~ ^1\.16(\.[0-9]+)?$ ]]; then ./scripts/cover.sh TRAVIS; else go test -v -race $PACKAGES; fi
after_success:
- if [[ "$TRAVIS_GO_VERSION" =~ ^1\.14(\.[0-9]+)?$ ]] && [ "$TRAVIS_TAG" != "" ]; then ghr --owner resgateio --token $GITHUB_TOKEN --draft --replace $TRAVIS_TAG pkg/; fi
- if [[ "$TRAVIS_GO_VERSION" =~ ^1\.16(\.[0-9]+)?$ ]] && [ "$TRAVIS_TAG" != "" ]; then ghr --owner resgateio --token $GITHUB_TOKEN --draft --replace $TRAVIS_TAG pkg/; fi
2 changes: 1 addition & 1 deletion docker/Dockerfile
@@ -1,4 +1,4 @@
FROM golang:1.14.4-alpine3.12 as builder
FROM golang:1.17.0-alpine3.14 as builder

LABEL maintainer="Samuel Jirenius <samuel@jirenius.com>"

Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.alpine
@@ -1,4 +1,4 @@
FROM golang:1.14.4-alpine3.12 as builder
FROM golang:1.17.0-alpine3.14 as builder

LABEL maintainer="Samuel Jirenius <samuel@jirenius.com>"

Expand All @@ -15,7 +15,7 @@ COPY . .

RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -v -ldflags "-s -w" -o /resgate

FROM alpine:3.12
FROM alpine:3.14
COPY --from=builder /resgate /bin/resgate

EXPOSE 8080
Expand Down
12 changes: 6 additions & 6 deletions examples/book-collection/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/book-collection/package.json
Expand Up @@ -3,7 +3,7 @@
"description": "Resgate Book Collection Example",
"dependencies": {
"connect": "^3.7.0",
"nats": "^1.4.9",
"nats": "^1.4.12",
"serve-static": "^1.14.1"
},
"devDependencies": {},
Expand Down
40 changes: 20 additions & 20 deletions examples/client-session/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f003f70

Please sign in to comment.