From 42cc6e6c3d7a5947023b3e63e9e70de5ee8eb926 Mon Sep 17 00:00:00 2001
From: abraunegg <alex.braunegg@gmail.com>
Date: Tue, 18 Apr 2023 07:23:27 +1000
Subject: [PATCH] Update golang to 1.20

* Update golang to 1.20
---
 .github/workflows/docker.yaml | 8 ++++----
 contrib/docker/Dockerfile     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index a3af6670..21d67e31 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -5,16 +5,16 @@ on:
     branches: [ master ]
     tags: [ 'v*' ]
   pull_request:
-    branches:
-      - master
-    types: [closed]
+    #branches:
+    #  - master
+    #types: [closed]
 
 env:
   DOCKER_HUB_SLUG: driveone/onedrive
 
 jobs:
   build:
-    if: (!(github.event.action == 'closed' && github.event.pull_request.merged != true))
+    #if: (!(github.event.action == 'closed' && github.event.pull_request.merged != true))
     runs-on: ubuntu-latest
 
     strategy:
diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
index 76b6c7c3..c30167b2 100644
--- a/contrib/docker/Dockerfile
+++ b/contrib/docker/Dockerfile
@@ -2,7 +2,7 @@
 
 ARG FEDORA_VERSION=37
 ARG DEBIAN_VERSION=bullseye
-ARG GO_VERSION=1.17
+ARG GO_VERSION=1.20
 ARG GOSU_VERSION=1.14
 
 FROM golang:${GO_VERSION}-${DEBIAN_VERSION} AS builder-gosu