From 884f424799eb17df7229d18a3fa20774d66f7543 Mon Sep 17 00:00:00 2001 From: fhackett Date: Fri, 15 Nov 2024 17:40:48 +0100 Subject: [PATCH] update go.mods again, remove go 1.18 from CI --- .github/workflows/ci.yml | 2 +- go_versions.sc | 23 +++++++++++++++++++ systems/dqueue/go.mod | 2 +- systems/gcounter/go.mod | 2 +- systems/loadbalancer/go.mod | 2 +- systems/locksvc/go.mod | 2 +- systems/nestedcrdtimpl/go.mod | 2 +- systems/pbkvs/go.mod | 2 +- systems/proxy/go.mod | 2 +- systems/raftkvs/go.mod | 2 +- systems/raftres/go.mod | 2 +- systems/replicatedkv/go.mod | 2 +- systems/shcounter/go.mod | 2 +- systems/shopcart/go.mod | 2 +- .../general/ExprTests.tla.gotests/go.mod | 2 +- .../general/IndexingLocals.tla.gotests/go.mod | 2 +- .../NonDetExploration.tla.gotests/go.mod | 2 +- .../general/PBFail4_bug125.tla.gotests/go.mod | 2 +- .../ProcedureSpaghetti.tla.gotests/go.mod | 2 +- .../files/general/bug2_124.tla.gotests/go.mod | 2 +- test/files/general/bug_119.tla.gotests/go.mod | 2 +- test/files/general/hello.tla.gotests/go.mod | 2 +- .../general/raft.tla.gotests.ignore/go.mod | 2 +- .../general/raftkvs.tla.gotests.ignore/go.mod | 2 +- .../files/gogen/EmptyBlock.tla.gotests/go.mod | 2 +- test/files/gogen/bug_167.tla.gotests/go.mod | 2 +- 26 files changed, 48 insertions(+), 25 deletions(-) create mode 100644 go_versions.sc diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 661d6e15..376b5c2a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: java-version: ['11', '21'] - golang-version: ['1.18', '1.23'] + golang-version: ['1.22', '1.23'] steps: - uses: actions/checkout@v4 diff --git a/go_versions.sc b/go_versions.sc new file mode 100644 index 00000000..f4146a44 --- /dev/null +++ b/go_versions.sc @@ -0,0 +1,23 @@ +//val minGoVersion = "1.22" + +os.walk(os.pwd) + .filter(os.isDir) + .filter(dir => os.exists(dir / "go.mod")) + .foreach { dir => + println(s"updating $dir...") + + os.call(List("go", "get", "-u"), cwd = dir) + os.call(List("go", "mod", "tidy"), cwd = dir) + + // val modLines = os.read.lines(dir / "go.mod") + + // os.write.over(dir / "go.mod", modLines + // .iterator + // .flatMap { + // case s"go $version" => Iterator.single(s"go $minGoVersion") + // case s"toolchain $_" => Iterator.empty + // case line => Iterator.single(line) + // } + // .map(_ ++ "\n") + // ) + } diff --git a/systems/dqueue/go.mod b/systems/dqueue/go.mod index a492612d..a5ae4421 100644 --- a/systems/dqueue/go.mod +++ b/systems/dqueue/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../distsys -require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a +require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 require ( github.com/benbjohnson/immutable v0.4.3 // indirect diff --git a/systems/gcounter/go.mod b/systems/gcounter/go.mod index e3fd097d..fb4926d3 100644 --- a/systems/gcounter/go.mod +++ b/systems/gcounter/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../distsys -require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a +require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 require ( github.com/benbjohnson/immutable v0.4.3 // indirect diff --git a/systems/loadbalancer/go.mod b/systems/loadbalancer/go.mod index e8d8dd37..9004ac4c 100644 --- a/systems/loadbalancer/go.mod +++ b/systems/loadbalancer/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../distsys -require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a +require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 require ( github.com/benbjohnson/immutable v0.4.3 // indirect diff --git a/systems/locksvc/go.mod b/systems/locksvc/go.mod index b16360bf..f7ad9917 100644 --- a/systems/locksvc/go.mod +++ b/systems/locksvc/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../distsys -require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a +require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 require ( github.com/benbjohnson/immutable v0.4.3 // indirect diff --git a/systems/nestedcrdtimpl/go.mod b/systems/nestedcrdtimpl/go.mod index 157d72d7..d23b30b1 100644 --- a/systems/nestedcrdtimpl/go.mod +++ b/systems/nestedcrdtimpl/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../distsys require ( - github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a + github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 github.com/benbjohnson/immutable v0.4.3 ) diff --git a/systems/pbkvs/go.mod b/systems/pbkvs/go.mod index 9a7aa7a2..a538198f 100644 --- a/systems/pbkvs/go.mod +++ b/systems/pbkvs/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../distsys require ( - github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a + github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 github.com/spf13/viper v1.15.0 ) diff --git a/systems/proxy/go.mod b/systems/proxy/go.mod index 0a262dee..baf85ed1 100644 --- a/systems/proxy/go.mod +++ b/systems/proxy/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../distsys -require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a +require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 require ( github.com/benbjohnson/immutable v0.4.3 // indirect diff --git a/systems/raftkvs/go.mod b/systems/raftkvs/go.mod index c2bfcf98..66cfcb53 100644 --- a/systems/raftkvs/go.mod +++ b/systems/raftkvs/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../distsys require ( - github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a + github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 github.com/benbjohnson/immutable v0.4.3 github.com/dgraph-io/badger/v3 v3.2103.5 github.com/pkg/profile v1.7.0 diff --git a/systems/raftres/go.mod b/systems/raftres/go.mod index 457cf05a..a6587728 100644 --- a/systems/raftres/go.mod +++ b/systems/raftres/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../distsys require ( - github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a + github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 github.com/benbjohnson/immutable v0.4.3 github.com/dgraph-io/badger/v3 v3.2103.5 github.com/spf13/viper v1.19.0 diff --git a/systems/replicatedkv/go.mod b/systems/replicatedkv/go.mod index eca9be63..3f0e773b 100644 --- a/systems/replicatedkv/go.mod +++ b/systems/replicatedkv/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../distsys -require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a +require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 require ( github.com/benbjohnson/immutable v0.4.3 // indirect diff --git a/systems/shcounter/go.mod b/systems/shcounter/go.mod index a0fec8d1..eeb066b3 100644 --- a/systems/shcounter/go.mod +++ b/systems/shcounter/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../distsys -require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a +require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 require ( github.com/benbjohnson/immutable v0.4.3 // indirect diff --git a/systems/shopcart/go.mod b/systems/shopcart/go.mod index 93cf0d7a..ab166d80 100644 --- a/systems/shopcart/go.mod +++ b/systems/shopcart/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../distsys require ( - github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a + github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 github.com/spf13/viper v1.19.0 ) diff --git a/test/files/general/ExprTests.tla.gotests/go.mod b/test/files/general/ExprTests.tla.gotests/go.mod index 825389b3..71923582 100644 --- a/test/files/general/ExprTests.tla.gotests/go.mod +++ b/test/files/general/ExprTests.tla.gotests/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../../../distsys -require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a +require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 require ( github.com/benbjohnson/immutable v0.4.3 // indirect diff --git a/test/files/general/IndexingLocals.tla.gotests/go.mod b/test/files/general/IndexingLocals.tla.gotests/go.mod index 825389b3..71923582 100644 --- a/test/files/general/IndexingLocals.tla.gotests/go.mod +++ b/test/files/general/IndexingLocals.tla.gotests/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../../../distsys -require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a +require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 require ( github.com/benbjohnson/immutable v0.4.3 // indirect diff --git a/test/files/general/NonDetExploration.tla.gotests/go.mod b/test/files/general/NonDetExploration.tla.gotests/go.mod index 336a4ea6..d3758845 100644 --- a/test/files/general/NonDetExploration.tla.gotests/go.mod +++ b/test/files/general/NonDetExploration.tla.gotests/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../../../distsys -require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a +require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 require ( github.com/benbjohnson/immutable v0.4.3 // indirect diff --git a/test/files/general/PBFail4_bug125.tla.gotests/go.mod b/test/files/general/PBFail4_bug125.tla.gotests/go.mod index 07a3ffcb..6074c439 100644 --- a/test/files/general/PBFail4_bug125.tla.gotests/go.mod +++ b/test/files/general/PBFail4_bug125.tla.gotests/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../../../distsys -require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a +require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 require ( github.com/benbjohnson/immutable v0.4.3 // indirect diff --git a/test/files/general/ProcedureSpaghetti.tla.gotests/go.mod b/test/files/general/ProcedureSpaghetti.tla.gotests/go.mod index ec7d802f..2d429308 100644 --- a/test/files/general/ProcedureSpaghetti.tla.gotests/go.mod +++ b/test/files/general/ProcedureSpaghetti.tla.gotests/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../../../distsys -require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a +require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 require ( github.com/benbjohnson/immutable v0.4.3 // indirect diff --git a/test/files/general/bug2_124.tla.gotests/go.mod b/test/files/general/bug2_124.tla.gotests/go.mod index 5e592277..daaf0446 100644 --- a/test/files/general/bug2_124.tla.gotests/go.mod +++ b/test/files/general/bug2_124.tla.gotests/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../../../distsys -require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a +require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 require ( github.com/benbjohnson/immutable v0.4.3 // indirect diff --git a/test/files/general/bug_119.tla.gotests/go.mod b/test/files/general/bug_119.tla.gotests/go.mod index 607c7755..02a3ea0d 100644 --- a/test/files/general/bug_119.tla.gotests/go.mod +++ b/test/files/general/bug_119.tla.gotests/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../../../distsys -require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a +require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 require ( github.com/benbjohnson/immutable v0.4.3 // indirect diff --git a/test/files/general/hello.tla.gotests/go.mod b/test/files/general/hello.tla.gotests/go.mod index 1d9b9f29..34f84d67 100644 --- a/test/files/general/hello.tla.gotests/go.mod +++ b/test/files/general/hello.tla.gotests/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../../../distsys require ( - github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a + github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 github.com/dgraph-io/badger/v3 v3.2103.5 ) diff --git a/test/files/general/raft.tla.gotests.ignore/go.mod b/test/files/general/raft.tla.gotests.ignore/go.mod index 98b88e19..5e4e3614 100644 --- a/test/files/general/raft.tla.gotests.ignore/go.mod +++ b/test/files/general/raft.tla.gotests.ignore/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../../../distsys -require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a +require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 require ( github.com/benbjohnson/immutable v0.4.3 // indirect diff --git a/test/files/general/raftkvs.tla.gotests.ignore/go.mod b/test/files/general/raftkvs.tla.gotests.ignore/go.mod index 9174eecc..422a281c 100644 --- a/test/files/general/raftkvs.tla.gotests.ignore/go.mod +++ b/test/files/general/raftkvs.tla.gotests.ignore/go.mod @@ -7,7 +7,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../../../distsys require ( - github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a + github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 github.com/benbjohnson/immutable v0.4.3 github.com/dgraph-io/badger/v3 v3.2103.5 ) diff --git a/test/files/gogen/EmptyBlock.tla.gotests/go.mod b/test/files/gogen/EmptyBlock.tla.gotests/go.mod index 07695b02..10bc9186 100644 --- a/test/files/gogen/EmptyBlock.tla.gotests/go.mod +++ b/test/files/gogen/EmptyBlock.tla.gotests/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../../../distsys -require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a +require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 require ( github.com/benbjohnson/immutable v0.4.3 // indirect diff --git a/test/files/gogen/bug_167.tla.gotests/go.mod b/test/files/gogen/bug_167.tla.gotests/go.mod index 7660aac1..9298e132 100644 --- a/test/files/gogen/bug_167.tla.gotests/go.mod +++ b/test/files/gogen/bug_167.tla.gotests/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.2 replace github.com/UBC-NSS/pgo/distsys => ../../../../distsys -require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115151405-18034beb253a +require github.com/UBC-NSS/pgo/distsys v0.0.0-20241115155132-ac5da2a2c7c6 require ( github.com/benbjohnson/immutable v0.4.3 // indirect