From 6f03a6c586bcf697ebe7ac4690f8ba89e01049e7 Mon Sep 17 00:00:00 2001 From: James Brumond Date: Fri, 3 Nov 2023 18:20:12 -0700 Subject: [PATCH] publish build --- .gitea/workflows/build-and-pubish.yaml | 5 ++++- .gitea/workflows/build.yaml | 7 ++++--- Dockerfile | 5 ++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/build-and-pubish.yaml b/.gitea/workflows/build-and-pubish.yaml index 48b3e16..2360e79 100644 --- a/.gitea/workflows/build-and-pubish.yaml +++ b/.gitea/workflows/build-and-pubish.yaml @@ -2,7 +2,10 @@ name: Build and publish container images on: -- workflow_dispatch + workflow_dispatch: { } + push: + branches: + - master jobs: build-and-publish: diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 1cebbff..1e66eea 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -2,9 +2,10 @@ name: Build container images on: - push: - branches: - - master + workflow_dispatch: { } + # push: + # branches: + # - master jobs: build: diff --git a/Dockerfile b/Dockerfile index 1e4f188..9a4ba26 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ ARG NODE_VERSION=20 +ARG RUST_TOOLCHAIN="" FROM node:${NODE_VERSION} @@ -22,7 +23,9 @@ ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \ CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \ CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++ -RUN rustup toolchain install stable-x86_64-unknown-linux-gnu +RUN if test "${RUST_TOOLCHAIN}x" != "x" ; \ + then rustup toolchain install $RUST_TOOLCHAIN ; \ + fi RUN rustup target add x86_64-pc-windows-gnu RUN rustup target add x86_64-unknown-linux-gnu