From 71ac59797a6483a45d9c56d501efc7a9df8ba09b Mon Sep 17 00:00:00 2001 From: n0vad3v Date: Fri, 16 Aug 2024 21:35:19 +0800 Subject: [PATCH 1/2] Bump to Go 1.23 --- .github/workflows/CI.yaml | 2 +- .github/workflows/codecov.yaml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- Dockerfile | 2 +- go.mod | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 26cee3b39..29b74230b 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -19,7 +19,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version: '1.23' - name: Setup necessary packages run: | diff --git a/.github/workflows/codecov.yaml b/.github/workflows/codecov.yaml index 5338d235e..b30c1a4ee 100644 --- a/.github/workflows/codecov.yaml +++ b/.github/workflows/codecov.yaml @@ -19,7 +19,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version: '1.23' - name: Setup necessary packages run: | diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index e82328bdb..2062add3a 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -40,7 +40,7 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: '1.22' + go-version: '1.23' - name: Initialize CodeQL uses: github/codeql-action/init@v2 diff --git a/Dockerfile b/Dockerfile index ffc2186ca..44ce5fcf2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22-bookworm as builder +FROM golang:1.23-bookworm as builder ARG IMG_PATH=/opt/pics ARG EXHAUST_PATH=/opt/exhaust diff --git a/go.mod b/go.mod index 29281e8fa..99903dcfb 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module webp_server_go -go 1.22 +go 1.23 require ( github.com/cespare/xxhash v1.1.0 From 109a47d31064da3bbc9dc35b171967e4000004e7 Mon Sep 17 00:00:00 2001 From: n0vad3v Date: Fri, 16 Aug 2024 21:46:23 +0800 Subject: [PATCH 2/2] Install docker-compose --- .github/workflows/integration-test.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index dc5a842c4..39af42761 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -15,6 +15,11 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 + + - name: Install docker-compose + run: | + sudo apt-get update + sudo apt-get install -y docker-compose - name: Build image uses: docker/build-push-action@v3 @@ -44,7 +49,12 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - + + - name: Install docker-compose + run: | + sudo apt-get update + sudo apt-get install -y docker-compose + - name: Build image uses: docker/build-push-action@v3 with: