From dc8dcab69010cb84ee0f31998c5d31c84131109a Mon Sep 17 00:00:00 2001 From: Marcin Kaciuba Date: Sun, 21 May 2023 15:38:12 +0200 Subject: [PATCH] ci: fix release pipeline --- .github/workflows/docker-build-base.yaml | 43 ++++++++++++++++++++++++ Dockerfile | 2 +- pkg/cache/memory_test.go | 3 +- 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/docker-build-base.yaml diff --git a/.github/workflows/docker-build-base.yaml b/.github/workflows/docker-build-base.yaml new file mode 100644 index 0000000..e6eadfc --- /dev/null +++ b/.github/workflows/docker-build-base.yaml @@ -0,0 +1,43 @@ +name: Docker build + +on: + push: + branches: + - 'master' + paths: + - Dockerfile.base + +jobs: + multi: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v2 + + - name: git tag + run: git fetch --tags; git fetch --prune --unshallow || true + + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ github.actor }} + password: ${{ secrets.GHR_TOKEN }} + registry: ghcr.io + - + name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + file: ./Dockerfile.base + platforms: linux/arm64,linux/amd64 + push: true + tags: ghcr.io/aldor007/mort-base:latest + diff --git a/Dockerfile b/Dockerfile index 97fe857..ebe9a75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ARG DATE "now" ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-$TARGETARCH.tar.gz -RUN curl -fsSL --insecure "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \ +RUN rm -rvf /usr/local/go/ && curl -fsSL --insecure "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \ && tar -C /usr/local -xzf golang.tar.gz \ && rm golang.tar.gz diff --git a/pkg/cache/memory_test.go b/pkg/cache/memory_test.go index 6423b70..8a5a601 100644 --- a/pkg/cache/memory_test.go +++ b/pkg/cache/memory_test.go @@ -16,7 +16,8 @@ func TestMemoryCache_Set(t *testing.T) { i.Set(&obj, res) resCache, err := i.Get(&obj) - b, _ := resCache.Body() + assert.Nil(t, err) + b, err := resCache.Body() assert.Nil(t, err) assert.Equal(t, resCache.StatusCode, res.StatusCode)