Skip to content

Commit

Permalink
Merge pull request #4 from kthxat/dependabot/go_modules/golang.org/x/…
Browse files Browse the repository at this point in the history
…crypto-0.17.0

Bump golang dependencies
Bump golang version
Improve pr verify workflow
  • Loading branch information
lukeb2e authored Feb 28, 2024
2 parents 8ecc521 + b5d2eb8 commit b1caee2
Show file tree
Hide file tree
Showing 6 changed files with 127 additions and 1,331 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ on:
- 'develop'
tags:
- v*
pull_request:
branches:
- 'master'
- 'main'

env:
CI_REGISTRY_IMAGE: ghcr.io/${{ github.repository }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ on:
jobs:
build:
name: Build
runs-on: [self-hosted, linux]
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.x
uses: actions/setup-go@v3
with:
go-version: ^1.20
go-version: ^1.22
id: go

- name: Check out code into the Go module directory
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# Folders
_obj
_test
.idea/

# Architecture specific extensions/prefixes
*.[568vq]
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20-alpine
FROM golang:1.22-alpine

RUN apk add --no-cache git

Expand Down
59 changes: 49 additions & 10 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,22 +1,61 @@
module github.com/kthxat/filament

go 1.12
go 1.22

require (
github.com/BurntSushi/toml v1.2.1
github.com/BurntSushi/toml v1.3.2
github.com/GeertJohan/go.rice v1.0.3
github.com/davecgh/go-spew v1.1.1
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
github.com/dustin/go-humanize v1.0.1
github.com/foolin/gin-template v0.0.0-20190415034731-41efedfb393b
github.com/gin-gonic/gin v1.9.1
github.com/mitchellh/go-homedir v1.1.0
github.com/nicksnyder/go-i18n/v2 v2.2.1
github.com/rogpeppe/go-internal v1.8.0 // indirect
github.com/rs/xid v1.4.0
github.com/nicksnyder/go-i18n/v2 v2.4.0
github.com/rs/xid v1.5.0
github.com/secsy/goftp v0.0.0-20200609142545-aa2de14babf4
github.com/spf13/viper v1.15.0
go.uber.org/multierr v1.8.0
golang.org/x/crypto v0.9.0
golang.org/x/text v0.9.0
github.com/spf13/viper v1.18.2
go.uber.org/multierr v1.11.0
golang.org/x/crypto v0.20.0
golang.org/x/text v0.14.0
)

require (
github.com/bytedance/sonic v1.11.1 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
github.com/chenzhuoyu/iasm v0.9.1 // indirect
github.com/daaku/go.zipexe v1.0.2 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.18.0 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.12 // indirect
golang.org/x/arch v0.7.0 // indirect
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sys v0.17.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit b1caee2

Please sign in to comment.