From b9f05878fadb707ad0de146d31cb219d40834e07 Mon Sep 17 00:00:00 2001 From: Niklas Fasching Date: Sun, 28 Mar 2021 17:13:16 +0200 Subject: [PATCH] Revert "Manually install go 1.16 until github actions updates image" This reverts commit bf7f957af2a1a00b0727a0a7df326f4a2d413429. We still have to manually install it for now but we don't have to fuck around with env vars anymore. github actions still defaults to go 1.15 [1]. Whatever. [1] ``` ls -lisah $(which go) 108022 0 lrwxrwxrwx 1 root root 42 Mar 18 22:15 /usr/bin/go -> /opt/hostedtoolcache/go/1.15.10/x64/bin/go ``` --- .github/workflows/ci.yml | 8 ++++---- org/testdata/misc.html | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 55fdeac..8b8cf91 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,14 +14,14 @@ jobs: git config user.name "GitHub Action" git config user.email "action@github.com" git log -1 --format="%H" + - name: go + run: sudo snap install go --classic - name: test - run: | - sudo snap install go --edge --classic - GOROOT=/snap/go/current make test + run: make test - name: gh-pages run: | git checkout --orphan gh-pages && git reset - GOROOT=/snap/go/current make generate-gh-pages + make generate-gh-pages git add -f docs/ && git commit -m deploy git push -f origin gh-pages - name: notify diff --git a/org/testdata/misc.html b/org/testdata/misc.html index 9167c27..06ea147 100644 --- a/org/testdata/misc.html +++ b/org/testdata/misc.html @@ -219,14 +219,14 @@ jobs: git config user.name "GitHub Action" git config user.email "action@github.com" git log -1 --format="%H" + - name: go + run: sudo snap install go --classic - name: test - run: | - sudo snap install go --edge --classic - GOROOT=/snap/go/current make test + run: make test - name: gh-pages run: | git checkout --orphan gh-pages && git reset - GOROOT=/snap/go/current make generate-gh-pages + make generate-gh-pages git add -f docs/ && git commit -m deploy git push -f origin gh-pages - name: notify