From b8d84f330f2df58e416755957e3466d0144b3a6e Mon Sep 17 00:00:00 2001 From: Sameh Abouel-saad Date: Mon, 25 Nov 2024 18:05:00 +0200 Subject: [PATCH] Update CI and test image --- .github/workflows/010_build_and_test.yaml | 2 +- .github/workflows/020_lint_and_test_go_client.yaml | 11 ++++++----- .github/workflows/build_test.Dockerfile | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/010_build_and_test.yaml b/.github/workflows/010_build_and_test.yaml index 7f150a3df..2c96f8af1 100644 --- a/.github/workflows/010_build_and_test.yaml +++ b/.github/workflows/010_build_and_test.yaml @@ -8,7 +8,7 @@ jobs: build-and-test: runs-on: [self-hosted, tfchainrunner01] container: - image: threefolddev/tfchain:4 + image: threefolddev/tfchain:5 env: DEBIAN_FRONTEND: noninteractive PATH: /root/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin diff --git a/.github/workflows/020_lint_and_test_go_client.yaml b/.github/workflows/020_lint_and_test_go_client.yaml index 5694ef912..188a7ce70 100644 --- a/.github/workflows/020_lint_and_test_go_client.yaml +++ b/.github/workflows/020_lint_and_test_go_client.yaml @@ -21,21 +21,22 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.20" + go-version: "1.21" cache: false # cache-dependency-path: clients/tfchain-client-go/go.sum id: go - name: golangci-lint - uses: golangci/golangci-lint-action@v3.7.0 + uses: golangci/golangci-lint-action@v6 with: args: --timeout 3m --verbose working-directory: clients/tfchain-client-go - name: staticcheck - uses: dominikh/staticcheck-action@v1.3.0 + uses: dominikh/staticcheck-action@v1 with: - version: "2022.1.3" + version: "latest" + install-go: false working-directory: clients/tfchain-client-go env: GO111MODULE: on @@ -44,4 +45,4 @@ jobs: uses: Jerome1337/gofmt-action@v1.0.5 with: gofmt-path: './clients/tfchain-client-go' - gofmt-flags: "-l -d" + gofmt-flags: "-l -d" \ No newline at end of file diff --git a/.github/workflows/build_test.Dockerfile b/.github/workflows/build_test.Dockerfile index e8b37454a..43fdb2e54 100644 --- a/.github/workflows/build_test.Dockerfile +++ b/.github/workflows/build_test.Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 ENV DEBIAN_FRONTEND=noninteractive RUN apt update && \ apt install -y \ @@ -16,8 +16,8 @@ RUN apt update && \ zstd \ wget \ protobuf-compiler && \ - wget https://go.dev/dl/go1.20.2.linux-amd64.tar.gz && \ - tar -xvf go1.20.2.linux-amd64.tar.gz && \ + wget https://go.dev/dl/go1.21.13.linux-amd64.tar.gz && \ + tar -xvf go1.21.13.linux-amd64.tar.gz && \ mv go /usr/local && \ echo "GOPATH=/usr/local/go" >> ~/.bashrc && \ echo "PATH=\$PATH:\$GOPATH/bin" >> ~/.bashrc && \