From 6fe14d4392678b50ce44ca50441932c66d610a4c Mon Sep 17 00:00:00 2001 From: Roger Eivind Stenbro <40600023+restenb@users.noreply.github.com> Date: Mon, 12 Dec 2022 10:07:54 +0100 Subject: [PATCH] Libcosim 0.10.0 release (#206) * bumped libcosim * updates * bump --- .dockerfiles/Dockerfile | 4 ++-- ...s-18.04-azure.list => sources-20.04-azure.list} | 0 .github/workflows/ci-cosim-demo-app.yml | 3 ++- conanfile.txt | 2 +- go.mod | 14 +++++++++----- go.sum | 4 +++- 6 files changed, 17 insertions(+), 10 deletions(-) rename .dockerfiles/{sources-18.04-azure.list => sources-20.04-azure.list} (100%) diff --git a/.dockerfiles/Dockerfile b/.dockerfiles/Dockerfile index 779487f8..38425ed4 100644 --- a/.dockerfiles/Dockerfile +++ b/.dockerfiles/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 -COPY sources-18.04-azure.list /etc/apt/sources.list +COPY sources-20.04-azure.list /etc/apt/sources.list RUN apt-get update && \ apt-get install -y --no-install-recommends \ diff --git a/.dockerfiles/sources-18.04-azure.list b/.dockerfiles/sources-20.04-azure.list similarity index 100% rename from .dockerfiles/sources-18.04-azure.list rename to .dockerfiles/sources-20.04-azure.list diff --git a/.github/workflows/ci-cosim-demo-app.yml b/.github/workflows/ci-cosim-demo-app.yml index 5e9a05aa..f0bdcc82 100644 --- a/.github/workflows/ci-cosim-demo-app.yml +++ b/.github/workflows/ci-cosim-demo-app.yml @@ -36,7 +36,8 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-18.04, windows-2019] + os: [ubuntu-20.04, windows-2019] + compiler_version: [9] env: CONAN_LOGIN_USERNAME_OSP: ${{ secrets.osp_artifactory_usr }} diff --git a/conanfile.txt b/conanfile.txt index 6b33aeca..4c5be263 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,7 +1,7 @@ [generators] [requires] -libcosimc/0.9.0@osp/stable +libcosimc/0.10.1@osp/stable [options] libcosim:proxyfmu=True diff --git a/go.mod b/go.mod index 5890ff2c..cce99b1c 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,14 @@ module cosim-demo-app -go 1.14 +go 1.18 require ( - github.com/gobuffalo/packr v1.30.1 - github.com/gorilla/mux v1.7.4 - github.com/gorilla/websocket v1.4.2 - github.com/ugorji/go/codec v1.1.7 + github.com/gobuffalo/packr v1.30.1 + github.com/gorilla/mux v1.7.4 + github.com/gorilla/websocket v1.4.2 + github.com/ugorji/go/codec v1.1.7 + github.com/gobuffalo/envy v1.7.0 // indirect + github.com/gobuffalo/packd v0.3.0 // indirect + github.com/joho/godotenv v1.3.0 // indirect + github.com/rogpeppe/go-internal v1.3.0 // indirect ) diff --git a/go.sum b/go.sum index cbee622a..ec10538b 100644 --- a/go.sum +++ b/go.sum @@ -5,6 +5,7 @@ github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8Nz github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/gobuffalo/envy v1.7.0 h1:GlXgaiBkmrYMHco6t4j7SacKO4XUjvh5pwXh0f4uxXU= @@ -33,6 +34,7 @@ github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk= @@ -48,8 +50,8 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=