Skip to content

Commit

Permalink
Merge branch 'master' into dev-fteid
Browse files Browse the repository at this point in the history
  • Loading branch information
gruyaume authored Aug 20, 2024
2 parents e2dc4ca + 2d40b5a commit 7db855b
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
- uses: actions/checkout@v4

- name: Check Spelling
uses: rojopolis/spellcheck-github-actions@0.40.0
uses: rojopolis/spellcheck-github-actions@0.41.0
with:
config_path: .spellcheck.yml
task_name: Markdown
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ jobs:
commit-message: Update version
committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>
signoff: false
signoff: true
branch: version-update
delete-branch: true
title: Update version
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ WORKDIR /opt/bess/bessctl
ENTRYPOINT ["bessd", "-f"]

# Stage build bess golang pb
FROM golang:1.22.5 AS protoc-gen
FROM golang:1.23.0 AS protoc-gen
RUN go install github.com/golang/protobuf/protoc-gen-go@latest

FROM bess-build AS go-pb
Expand All @@ -120,7 +120,7 @@ RUN mkdir /bess_pb && \
--python_out=plugins=grpc:/bess_pb \
--grpc_python_out=/bess_pb

FROM golang:1.22.5 AS pfcpiface-build
FROM golang:1.23.0 AS pfcpiface-build
ARG GOFLAGS
WORKDIR /pfcpiface

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/Showmax/go-fqdn v1.0.0
github.com/antoninbas/p4runtime-go-client v0.0.0-20220204221603-49eba9f248c1
github.com/deckarep/golang-set v1.8.0
github.com/docker/docker v26.1.4+incompatible
github.com/docker/docker v26.1.5+incompatible
github.com/docker/go-connections v0.4.0
github.com/ettle/strcase v0.1.1
github.com/golang/protobuf v1.5.4
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsP
github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
github.com/docker/docker v26.1.4+incompatible h1:vuTpXDuoga+Z38m1OZHzl7NKisKWaWlhjQk7IDPSLsU=
github.com/docker/docker v26.1.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v26.1.5+incompatible h1:NEAxTwEjxV6VbBMBoGG3zPqbiJosIApZjxlbrG9q3/g=
github.com/docker/docker v26.1.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
Expand Down
3 changes: 1 addition & 2 deletions pkg/fake_bess/fake_bess.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
package fake_bess

import (
"fmt"
"net"

"github.com/omec-project/upf-epc/pfcpiface/bess_pb"
Expand All @@ -26,7 +25,7 @@ func NewFakeBESS() *FakeBESS {

// Run starts and runs the BESS gRPC server on the given address. Blocking until Stop is called.
func (b *FakeBESS) Run(address string) error {
listener, err := net.Listen("tcp", fmt.Sprintf(address))
listener, err := net.Listen("tcp", address)
if err != nil {
return err
}
Expand Down

0 comments on commit 7db855b

Please sign in to comment.