This commit is contained in:
Mayel de Borniol 2023-12-22 21:50:33 +00:00
parent bd02d142c6
commit 12c9206678
7 changed files with 12 additions and 11 deletions

View file

@ -8,7 +8,7 @@ jobs:
docs:
name: Generate docs (upon new release)
runs-on: ubuntu-latest
container: hexpm/elixir:1.15.7-erlang-26.2.1-alpine-3.18.4
container: hexpm/elixir:1.16.0-erlang-26.2.1-alpine-3.18.4
env:
FLAVOUR: cooperation
FLAVOUR_PATH: flavours/cooperation

View file

@ -21,7 +21,7 @@ jobs:
DOCKER_REPO: bonfire
ALPINE_VERSION: 3.18.4
ERLANG_VERSION: 26.2.1
ELIXIR_VERSION: 1.15.7
ELIXIR_VERSION: 1.16.0
steps:
-
name: Cancel any already running releases workflows

View file

@ -11,7 +11,7 @@ jobs:
test_classic_flavour:
name: Test classic flavour
runs-on: ubuntu-latest
container: hexpm/elixir:1.15.7-erlang-26.2.1-alpine-3.18.4
container: hexpm/elixir:1.16.0-erlang-26.2.1-alpine-3.18.4
env:
FLAVOUR: classic
MIX_ENV: test

View file

@ -1,6 +1,6 @@
# NOTE: see instructions in .tool-versions.env
erlang 26.2.1
elixir 1.15.7-otp-26
elixir 1.16.0-otp-26
just 1.16.0
yarn 1.22.19
nodejs 21.3.0

View file

@ -7,4 +7,4 @@
# The version of Alpine to use for the final image - should match a version used in the Elixir docker image, which can be checked on Docker Hub: https://hub.docker.com/r/hexpm/elixir/tags?name=alpine
ALPINE_VERSION="3.18.4"
ELIXIR_VERSION="1.15.7"
ELIXIR_VERSION="1.16.0"

View file

@ -192,13 +192,13 @@ if not Code.ensure_loaded?(Bonfire.Mixer) do
path
|> String.split("/")
|> Enum.at(2)
|> String.slice(0..-4)
|> String.slice(0..-4//1)
|> String.capitalize(),
filename:
path
|> String.split("/")
|> Enum.at(2)
|> String.slice(0..-4)
|> String.slice(0..-4//1)
|> then(&"deps-#{&1}")
]}
@ -274,7 +274,7 @@ if not Code.ensure_loaded?(Bonfire.Mixer) do
do: unpinned_git_dep?(dep)
# defp include_dep?(:docs = type, dep, deps_prefixes), do: String.starts_with?(dep_name(dep), deps_prefixes || @config[:deps_prefixes][type]) || git_dep?(dep)
def include_dep?(type, dep, prefixes) do
def include_dep?(_type, dep, prefixes) do
String.starts_with?(
dep_name(dep),
prefixes

View file

@ -7,10 +7,11 @@ defmodule Bonfire.Umbrella.MixProject do
# we only behave as an umbrella im dev/test env
@use_local_forks System.get_env("WITH_FORKS", "1") == "1"
@ext_forks_path Mixer.forks_path()
ext_forks_path = Mixer.forks_path()
@use_umbrella? Mix.env() == :dev and @use_local_forks and System.get_env("AS_UMBRELLA") == "1" and
File.exists?("#{@ext_forks_path}/bonfire")
@umbrella_path if @use_umbrella?, do: @ext_forks_path, else: nil
File.exists?("#{ext_forks_path}/bonfire")
@umbrella_path if @use_umbrella?, do: ext_forks_path, else: nil
if @use_umbrella?, do: IO.puts("NOTE: Running as umbrella...")