From b9e2e7b2503f528b9d232a3a84d4b6baff569389 Mon Sep 17 00:00:00 2001 From: Mayel de Borniol Date: Sun, 20 Oct 2024 13:57:36 +0100 Subject: [PATCH] up --- deps-debian-build.sh | 5 +++-- justfile | 8 ++++++-- mix.exs | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/deps-debian-build.sh b/deps-debian-build.sh index a4c78f7acf..e41274a274 100644 --- a/deps-debian-build.sh +++ b/deps-debian-build.sh @@ -8,10 +8,11 @@ chmod +x ./deps-debian.sh # dev deps apt-get install -q -y --no-install-recommends sqlite3 npm -# rustc cargo gcc g++ make +# rustc cargo g++ # deps of tools -apt-get install -q -y --no-install-recommends autoconf dpkg-dev libncurses-dev unixodbc-dev libssl-dev libsctp-dev libodbc1 libssl1.1 libsctp1 +apt-get install -q -y --no-install-recommends autoconf dpkg-dev libncurses-dev unixodbc-dev libssl-dev libsctp-dev libodbc1 libssl1.1 libsctp1 make gcc +# includes build tools needed for mise to build erlang ^ # tools # NOTE: using mise because bullseye elixir version is too old diff --git a/justfile b/justfile index 9ed0c69ced..8a29f6cd66 100644 --- a/justfile +++ b/justfile @@ -670,10 +670,14 @@ rel-rebuild: # Build the Docker image (NOT including changes to local forks) rel-build ARGS="": @echo "Please note that the build will not include any changes in forks that haven't been committed and pushed, you may want to run just contrib-release first." - @just rel-build remote {{ ARGS }} + @just rel-build-with-opts remote {{ ARGS }} + +rel-build-with-clones ARGS="": + @echo "Please note that the build will include changes in forks that haven't been committed and pushed." + @just rel-build-with-opts local {{ ARGS }} # Build the release -rel-build-with-clones USE_EXT="local" ARGS="": +rel-build-with-opts USE_EXT ARGS="": @just {{ if WITH_DOCKER != "no" {"rel-build-docker"} else {"rel-build-OTP"} }} {{ USE_EXT }} {{ ARGS }} # Build the OTP release diff --git a/mix.exs b/mix.exs index ffcb5fb554..c5799bbfb6 100644 --- a/mix.exs +++ b/mix.exs @@ -208,7 +208,7 @@ defmodule Bonfire.Umbrella.MixProject do # TODO: put these in ENV or an external writeable config file similar to deps.* @config [ # note that the flavour will automatically be added where the dash appears - version: "0.9.10-beta.162", + version: "0.9.10-beta.163", elixir: ">= #{System.get_env("ELIXIR_VERSION", "1.13.4")}", flavour: @flavour, default_flavour: @default_flavour,