From 32e9c4b13a23e31c49804239b0db4a467d2e7cb9 Mon Sep 17 00:00:00 2001
From: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
Date: Tue, 23 Nov 2021 19:58:55 +0100
Subject: [PATCH] Bump go rules (#11829)

* Bump go rules

Was debugging something else and this seemed simple enough to factor
it out.

changelog_begin
changelog_end

* Bump Bazel on Windows

changelog_begin
changelog_end

* bump bazel manifest

changelog_begin
changelog_end
---
 WORKSPACE                            |  2 +-
 ci/patch_bazel_windows/compile.yml   |  2 +-
 deps.bzl                             | 16 +++++++++-------
 dev-env/windows/manifests/bazel.json |  4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 143fd5f298b6..d2fb708402f5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -630,7 +630,7 @@ go_wrap_sdk(
 
 go_rules_dependencies()
 
-go_register_toolchains()
+go_register_toolchains() if not is_windows else go_register_toolchains(version = "1.16.9")
 
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
 
diff --git a/ci/patch_bazel_windows/compile.yml b/ci/patch_bazel_windows/compile.yml
index 340640abe008..663c6fdac103 100644
--- a/ci/patch_bazel_windows/compile.yml
+++ b/ci/patch_bazel_windows/compile.yml
@@ -42,7 +42,7 @@ jobs:
   variables:
     cache_key: $[ dependencies.patch_bazel_pre_check.outputs['out.cache_key'] ]
     should_run: $[ dependencies.patch_bazel_pre_check.outputs['out.should_run'] ]
-    bazel_base_version: 4.1.0
+    bazel_base_version: 4.2.1
   pool:
     vmImage: windows-2019
   steps:
diff --git a/deps.bzl b/deps.bzl
index 522df858b822..32fa190c011d 100644
--- a/deps.bzl
+++ b/deps.bzl
@@ -63,8 +63,10 @@ rules_nodejs_version = "4.4.2"
 rules_nodejs_sha256 = "3aa6296f453ddc784e1377e0811a59e1e6807da364f44b27856e34f5042043fe"
 rules_jvm_external_version = "3.3"
 rules_jvm_external_sha256 = "d85951a92c0908c80bd8551002d66cb23c3434409c814179c0ff026b53544dab"
-rules_go_version = "0.23.6"
-rules_go_sha256 = "8663604808d2738dc615a2c3eb70eba54a9a982089dd09f6ffe5d0e75771bc4f"
+rules_go_version = "0.29.0"
+rules_go_sha256 = "2b1641428dff9018f9e85c0384f03ec6c10660d935b750e3fa1492a281a53b0f"
+bazel_gazelle_version = "0.24.0"
+bazel_gazelle_sha256 = "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb"
 rules_bazel_common_version = "9e3880428c1837db9fb13335ed390b7e33e346a7"
 rules_bazel_common_sha256 = "48a209fed9575c9d108eaf11fb77f7fe6178a90135e4d60cac6f70c2603aa53a"
 
@@ -125,8 +127,8 @@ def daml_deps():
         http_archive(
             name = "io_bazel_rules_go",
             urls = [
-                "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v{version}/rules_go-v{version}.tar.gz".format(version = rules_go_version),
-                "https://github.com/bazelbuild/rules_go/releases/download/v{version}/rules_go-v{version}.tar.gz".format(version = rules_go_version),
+                "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v{version}/rules_go-v{version}.zip".format(version = rules_go_version),
+                "https://github.com/bazelbuild/rules_go/releases/download/v{version}/rules_go-v{version}.zip".format(version = rules_go_version),
             ],
             sha256 = rules_go_sha256,
         )
@@ -166,10 +168,10 @@ def daml_deps():
         http_archive(
             name = "bazel_gazelle",
             urls = [
-                "https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/bazel-gazelle/releases/download/v0.19.1/bazel-gazelle-v0.19.1.tar.gz",
-                "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.19.1/bazel-gazelle-v0.19.1.tar.gz",
+                "https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/bazel-gazelle/releases/download/v{version}/bazel-gazelle-v{version}.tar.gz".format(version = bazel_gazelle_version),
+                "https://github.com/bazelbuild/bazel-gazelle/releases/download/v{version}/bazel-gazelle-v{version}.tar.gz".format(version = bazel_gazelle_version),
             ],
-            sha256 = "86c6d481b3f7aedc1d60c1c211c6f76da282ae197c3b3160f54bd3a8f847896f",
+            sha256 = bazel_gazelle_sha256,
         )
 
     if "io_bazel_rules_sass" not in native.existing_rules():
diff --git a/dev-env/windows/manifests/bazel.json b/dev-env/windows/manifests/bazel.json
index a1ee4f219a3c..70ad32354c6c 100644
--- a/dev-env/windows/manifests/bazel.json
+++ b/dev-env/windows/manifests/bazel.json
@@ -5,8 +5,8 @@
   "bin": "bazel.exe",
   "architecture": {
     "64bit": {
-      "url": "https://daml-binaries.da-ext.net/patch_bazel_windows/bazel-b8aa0a994865f0f457473836de5896b4.zip",
-      "hash": "bae65445457b497e3912cc178b6ef649b4d5c36b90127aa7d617e457d8fa1d79"
+      "url": "https://daml-binaries.da-ext.net/patch_bazel_windows/bazel-be46798f67a4437875bfe23efb51935a.zip",
+      "hash": "670afb47f1b1a50747e90b570780ca54cfd29d9e5bf338a711c7f7d4758c9029"
     }
   },
   "depends": [