From 33d55298f92858e96b7189b9c46e257f3d954d03 Mon Sep 17 00:00:00 2001
From: Gabriel Simmer <g@gmem.ca>
Date: Sun, 6 Aug 2023 16:14:31 +0100
Subject: [PATCH 1/2] Revert #50
Now that https://code.forgejo.org/forgejo/runner/pulls/64 has been
merged we should be good to go.
---
Dockerfile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index a441325..eb15271 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,5 @@
#Build stage
-# Switch back to 1.20 instead of 1.20.5 when https://github.com/nektos/act/issues/1908 is resolved
-FROM golang:1.20.5-alpine3.18 AS build-env
+FROM golang:1.20-alpine3.18 AS build-env
RUN apk --no-cache add build-base git
From 046a9a99f7daf98ad9d7b54312b4e5048d327d36 Mon Sep 17 00:00:00 2001
From: Gabriel Simmer <g@gmem.ca>
Date: Sun, 6 Aug 2023 16:45:10 +0100
Subject: [PATCH 2/2] Remove pinned go version in test workflow
---
.forgejo/workflows/test.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml
index 48cca2a..1996570 100644
--- a/.forgejo/workflows/test.yml
+++ b/.forgejo/workflows/test.yml
@@ -36,8 +36,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
- # pin because of https://github.com/nektos/act/issues/1908
- go-version: 1.20.5
+ go-version: '1.20'
- uses: actions/checkout@v3