Skip to content

Commit

Permalink
Updated go version, packages, and deco (#52)
Browse files Browse the repository at this point in the history
* Updated go version to 1.21, updated packages, and updated deco to 1.4.1

* Update test workflow

* Fixed package updates

* Update test action to v3

---------

Co-authored-by: bt353 <[email protected]>
  • Loading branch information
btassone and bt353 authored Oct 7, 2023
1 parent f740634 commit 66a2ea7
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 59 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ jobs:
strategy:
matrix:
go-version:
- "1.18.x"
- "1.21.x"
os:
- "ubuntu-latest"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Setup Go ${{ matrix.go }}
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go-version }}

Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# build stage
FROM golang:alpine AS build-env
FROM golang:alpine3.18 AS build-env

ARG version="0.0.0"
ARG prerelease=""
Expand Down Expand Up @@ -29,7 +29,7 @@ RUN chmod 555 /app/api
RUN apk add --no-cache bash ca-certificates

# Install Deco
ARG DECO_VERSION=1.3.0
ARG DECO_VERSION=1.4.1
ARG DECO_OS=linux
ARG DECO_ARCH=amd64
ADD https://github.com/YaleUniversity/deco/releases/download/v${DECO_VERSION}/deco_${DECO_VERSION}_${DECO_OS}_${DECO_ARCH}.tar.gz /usr/local/bin/deco.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.local
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# build stage
FROM golang:alpine AS build-env
FROM golang:alpine3.18 AS build-env
RUN apk add --no-cache git openssh-client gcc musl-dev
RUN mkdir /app
WORKDIR /app
Expand Down
38 changes: 19 additions & 19 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
module github.com/YaleSpinup/ec2-api

go 1.18
go 1.21

require (
github.com/YaleSpinup/apierror v0.1.1
github.com/YaleSpinup/aws-go v0.2.1
github.com/aws/amazon-ec2-instance-selector/v2 v2.4.1
github.com/aws/aws-sdk-go v1.44.59
github.com/google/uuid v1.3.0
github.com/aws/aws-sdk-go v1.45.24
github.com/google/uuid v1.3.1
github.com/gorilla/handlers v1.5.1
github.com/gorilla/mux v1.8.0
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.17.0
github.com/sirupsen/logrus v1.9.3
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
golang.org/x/crypto v0.14.0
)

require (
github.com/atotto/clipboard v0.1.4 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/charmbracelet/bubbles v0.13.0 // indirect
github.com/charmbracelet/bubbletea v0.21.0 // indirect
github.com/charmbracelet/lipgloss v0.5.0 // indirect
github.com/charmbracelet/lipgloss v0.6.0 // indirect
github.com/containerd/console v1.0.3 // indirect
github.com/evertras/bubble-table v0.14.4 // indirect
github.com/felixge/httpsnoop v1.0.2 // indirect
github.com/evertras/bubble-table v0.15.2 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
github.com/muesli/cancelreader v0.2.0 // indirect
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/muesli/reflow v0.3.0 // indirect
github.com/muesli/termenv v0.11.1-0.20220212125758-44cd13922739 // indirect
github.com/muesli/termenv v0.15.2 // indirect
github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852 // indirect
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/sahilm/fuzzy v0.1.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
)
Loading

0 comments on commit 66a2ea7

Please sign in to comment.