From e35f66f63cd0f41b691ad4e87496995c66c17249 Mon Sep 17 00:00:00 2001 From: Joseph Kavanagh Date: Mon, 15 Apr 2024 21:00:14 +0100 Subject: [PATCH] build(go.mod): remove patch version from `go` directive * https://github.com/actions/setup-go/pull/458 * move web component build inside Dockerfile --- .github/workflows/build-docker.yml | 3 --- Dockerfile | 2 +- go.mod | 4 +++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 3a776e18..51be81f8 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -17,9 +17,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Build web components - run: make web - - name: Set outputs id: vars run: | diff --git a/Dockerfile b/Dockerfile index 200b2e30..7fa34179 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ COPY . /build/ WORKDIR /build/ ARG BUILD_VERSION="development" -RUN make BUILD_VERSION=${BUILD_VERSION} go-build +RUN make BUILD_VERSION=${BUILD_VERSION} build RUN chmod 755 /build/argus RUN chmod 755 /build/healthcheck diff --git a/go.mod b/go.mod index d645d7d9..0c1d62cb 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/release-argus/Argus -go 1.22.0 +go 1.22 + +toolchain go1.22.0 require ( github.com/Masterminds/semver/v3 v3.2.1