summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2023-04-06 15:23:36 +0100
committerGitHub <noreply@github.com>2023-04-06 15:23:36 +0100
commitec6430bad88ee7ab0b6d9df0d54cdbe68fa3c431 (patch)
tree28abeb05a4b0bddf00bd1d7672ea25e1080bb1d7
parentFix the 'set_device_id_for_pushers_txn' background update. (#15391) (diff)
downloadsynapse-ec6430bad88ee7ab0b6d9df0d54cdbe68fa3c431.tar.xz
Use setup-go instead of relying on go 1.17 to exist (#15403)
* Use setup-go instead of relying on 1.17 to exist

See https://github.com/actions/runner-images/issues/7276

* Changelog
Diffstat (limited to '')
-rwxr-xr-x.ci/scripts/setup_complement_prerequisites.sh10
-rw-r--r--.github/workflows/latest_deps.yml2
-rw-r--r--.github/workflows/tests.yml2
-rw-r--r--.github/workflows/twisted_trunk.yml2
-rw-r--r--changelog.d/15403.misc1
5 files changed, 7 insertions, 10 deletions
diff --git a/.ci/scripts/setup_complement_prerequisites.sh b/.ci/scripts/setup_complement_prerequisites.sh
index 3778478da6..47a3ff8e69 100755
--- a/.ci/scripts/setup_complement_prerequisites.sh
+++ b/.ci/scripts/setup_complement_prerequisites.sh
@@ -9,16 +9,6 @@ set -eu
 alias block='{ set +x; } 2>/dev/null; func() { echo "::group::$*"; set -x; }; func'
 alias endblock='{ set +x; } 2>/dev/null; func() { echo "::endgroup::"; set -x; }; func'
 
-block Set Go Version
-  # The path is set via a file given by $GITHUB_PATH. We need both Go 1.17 and GOPATH on the path to run Complement.
-  # See https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#adding-a-system-path
-
-  # Add Go 1.17 to the PATH: see https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-Readme.md#environment-variables-2
-  echo "$GOROOT_1_17_X64/bin" >> $GITHUB_PATH
-  # Add the Go path to the PATH: We need this so we can call gotestfmt
-  echo "~/go/bin" >> $GITHUB_PATH
-endblock
-
 block Install Complement Dependencies
   sudo apt-get -qq update && sudo apt-get install -qqy libolm3 libolm-dev
   go install -v github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@latest
diff --git a/.github/workflows/latest_deps.yml b/.github/workflows/latest_deps.yml
index d5a68ffa1f..c3705b059b 100644
--- a/.github/workflows/latest_deps.yml
+++ b/.github/workflows/latest_deps.yml
@@ -184,6 +184,8 @@ jobs:
         with:
           path: synapse
 
+      - uses: actions/setup-go@v4
+
       - name: Prepare Complement's Prerequisites
         run: synapse/.ci/scripts/setup_complement_prerequisites.sh
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a2cec324a5..f895163e51 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -555,6 +555,8 @@ jobs:
             toolchain: 1.58.1
       - uses: Swatinem/rust-cache@v2
 
+      - uses: actions/setup-go@v4
+
       - name: Prepare Complement's Prerequisites
         run: synapse/.ci/scripts/setup_complement_prerequisites.sh
 
diff --git a/.github/workflows/twisted_trunk.yml b/.github/workflows/twisted_trunk.yml
index 461c85067c..ad35c6b570 100644
--- a/.github/workflows/twisted_trunk.yml
+++ b/.github/workflows/twisted_trunk.yml
@@ -147,6 +147,8 @@ jobs:
         with:
           path: synapse
 
+      - uses: actions/setup-go@v4
+
       - name: Prepare Complement's Prerequisites
         run: synapse/.ci/scripts/setup_complement_prerequisites.sh
 
diff --git a/changelog.d/15403.misc b/changelog.d/15403.misc
new file mode 100644
index 0000000000..8d17b737bf
--- /dev/null
+++ b/changelog.d/15403.misc
@@ -0,0 +1 @@
+Update CI to run complement under the latest stable go version.