update go.mods again, remove go 1.18 from CI

DistCompiler · Nov 15, 2024 · 884f424 · 884f424
1 parent ac5da2a
commit 884f424
Show file tree

Hide file tree

Showing 26 changed files with 48 additions and 25 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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