From 4728e995bc280d9e1edf92303e043ae2626a1595 Mon Sep 17 00:00:00 2001 From: Jannis Mattheis Date: Sat, 16 Sep 2023 19:54:18 +0200 Subject: [PATCH] fix: update build deps --- .github/workflows/build.yml | 4 ++-- GO_VERSION | 2 +- Makefile | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c00792..1e9a4ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,10 +7,10 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: 1.19.x + go-version: 1.21.x - uses: actions/setup-node@v1 with: - node-version: '16' + node-version: '20' - uses: actions/cache@v2 with: path: ~/go/pkg/mod diff --git a/GO_VERSION b/GO_VERSION index 66e2ae6..2844977 100644 --- a/GO_VERSION +++ b/GO_VERSION @@ -1 +1 @@ -1.19.1 +1.21.1 diff --git a/Makefile b/Makefile index adff5ad..9b78d5c 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ DOCKER_BUILD_IMAGE=gotify/build DOCKER_WORKDIR=/proj DOCKER_RUN=docker run --rm -v "$$PWD/.:${DOCKER_WORKDIR}" -v "`go env GOPATH`/pkg/mod/.:/go/pkg/mod:ro" -w ${DOCKER_WORKDIR} DOCKER_GO_BUILD=go build -mod=readonly -a -installsuffix cgo -ldflags "$$LD_FLAGS" +NODE_OPTIONS=$(shell if node --help | grep -q -- "--openssl-legacy-provider"; then echo --openssl-legacy-provider; fi) test: test-coverage test-race test-js check: check-go check-swagger check-js @@ -124,7 +125,7 @@ build-docker-riscv64: require-version build-docker: build-docker-amd64 build-docker-arm-7 build-docker-arm64 build-docker-riscv64 build-js: - (cd ui && yarn build) + (cd ui && NODE_OPTIONS="${NODE_OPTIONS}" yarn build) build-linux-amd64: ${DOCKER_RUN} ${DOCKER_BUILD_IMAGE}:$(GO_VERSION)-linux-amd64 ${DOCKER_GO_BUILD} -o ${BUILD_DIR}/gotify-linux-amd64 ${DOCKER_WORKDIR}