Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/go_modules/github.com/google/uu…
Browse files Browse the repository at this point in the history
…id-1.5.0
  • Loading branch information
CesarGallego committed Jul 7, 2024
2 parents f70c3a9 + 460ea79 commit 991e6d5
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/go/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM golang:1.21.3
FROM golang:1.21.5
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3.6.0
uses: actions/checkout@v4.1.1

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/test_and_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ jobs:
unit-test:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3.6.0
- uses: actions/checkout@v4.1.1
- name: Load Go version
id: go-version
run: |
echo go-version=$(sed 's/^.*://' .github/go/Dockerfile) >> $GITHUB_OUTPUT
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: ${{ steps.go-version.outputs.go-version }}
- name: Unit tests
Expand All @@ -19,8 +19,8 @@ jobs:
lint:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3.6.0
- uses: actions/setup-go@v4
- uses: actions/checkout@v4.1.1
- uses: actions/setup-go@v5
with:
go-version: 1.17
- name: Lint
Expand All @@ -30,12 +30,12 @@ jobs:
spec-test:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3.6.0
- uses: actions/checkout@v4.1.1
- name: Load Go version
id: go-version
run: |
echo go-version=$(sed 's/^.*://' .github/go/Dockerfile) >> $GITHUB_OUTPUT
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: ${{ steps.go-version.outputs.go-version }}
- name: Build executable
Expand All @@ -51,7 +51,7 @@ jobs:
doc-test:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3.6.0
- uses: actions/checkout@v4.1.1
- name: Prepare Python env
run: |
sudo apt install python3
Expand All @@ -67,14 +67,14 @@ jobs:
runs-on: ubuntu-22.04
needs: [ unit-test, spec-test, doc-test, lint ]
steps:
- uses: actions/checkout@v3.6.0
- uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
- name: Load Go version
id: go-version
run: |
echo go-version=$(sed 's/^.*://' .github/go/Dockerfile) >> $GITHUB_OUTPUT
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: ${{ steps.go-version.outputs.go-version }}
- name: Select custom release notes
Expand All @@ -92,7 +92,7 @@ jobs:
username="${{ secrets.DOCKERHUB_USERNAME }}"
password="${{ secrets.DOCKERHUB_PASSWORD }}"
echo "$password" | docker login --username "$username" --password-stdin
- uses: goreleaser/goreleaser-action@v4.4.0
- uses: goreleaser/goreleaser-action@v5.0.0
with:
args: release --rm-dist ${{ steps.release-notes.outputs.ARGS }}
env:
Expand All @@ -113,7 +113,7 @@ jobs:
matrix:
binary: ["kapow_windows_386", "kapow_windows_amd64_v1"]
steps:
- uses: actions/checkout@v3.6.0
- uses: actions/checkout@v4.1.1
- name: Download a single artifact
uses: actions/download-artifact@v3
with:
Expand Down
6 changes: 3 additions & 3 deletions docs/Pipfile.lock

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

4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.20
require (
github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf
github.com/google/uuid v1.5.0
github.com/gorilla/mux v1.8.0
github.com/spf13/cobra v1.7.0
github.com/gorilla/mux v1.8.1
github.com/spf13/cobra v1.8.0
gopkg.in/h2non/gock.v1 v1.1.2
)

Expand Down
10 changes: 5 additions & 5 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf h1:7+FW5aGwISbqUtkfmIpZJGRgNFg2ioYPvFaUxdqpDsg=
github.com/google/shlex v0.0.0-20181106134648-c34317bd91bf/go.mod h1:RpwtwJQFrIEPstU94h88MWPXP2ektJZ8cZ0YntAmXiE=
github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4=
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
2 changes: 1 addition & 1 deletion testutils/poc/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
aiohttp==3.8.5
aiohttp==3.9.0
requests==2.31.0
click==7.0

0 comments on commit 991e6d5

Please sign in to comment.