Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sort-as: force an order on multiple profiles #1716

Merged
merged 9 commits into from
Mar 30, 2018
Merged

sort-as: force an order on multiple profiles #1716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3146a28
sort-as: force an order on multiple profiles
fenollp Feb 10, 2018
9f0e3a2
Revert "sort-as: force an order on multiple profiles"
fenollp Feb 16, 2018
e504ba7
sort-as: found the issue. Will look into tests now
fenollp Feb 17, 2018
abad0e1
sort-as: show issue more clearly
fenollp Feb 23, 2018
6aeff63
Revert "sort-as: show issue more clearly"
fenollp Feb 23, 2018
1d2aa24
Revert "sort-as: found the issue. Will look into tests now"
fenollp Feb 23, 2018
0d88ff8
do not append test profile if already there. Note that it comes from …
fenollp Feb 23, 2018
cfe6dfc
sort-as: bar profile specializes dep "b" into a version anterior to w…
fenollp Feb 23, 2018
1271458
sort-as: a more general pattern
fenollp Feb 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/rebar_state.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,12 +257,15 @@ apply_profiles(State, Profile) when not is_list(Profile) ->
apply_profiles(State, [default]) ->
State;
apply_profiles(State=#state_t{default = Defaults, current_profiles=CurrentProfiles}, Profiles) ->
ProvidedProfiles = lists:prefix([default|Profiles], CurrentProfiles),
AppliedProfiles = case Profiles of
%% Head of list global profile is special, only for use by rebar3
%% It does not clash if a user does `rebar3 as global...` but when
%% it is the head we must make sure not to prepend `default`
[global | _] ->
Profiles;
_ when ProvidedProfiles ->
deduplicate(CurrentProfiles);
_ ->
deduplicate(CurrentProfiles ++ Profiles)
end,
Expand Down
2 changes: 1 addition & 1 deletion test/rebar_profiles_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ implicit_profile_deduplicate_deps(Config) ->
rebar_test_utils:run_and_check(Config, RebarConfig,
["as", "test,bar", "eunit"], {ok, [{app, Name}
,{dep, "a", "1.0.0"}
,{dep, "b", "2.0.0"}]}).
,{dep, "b", "1.0.0"}]}).

all_deps_code_paths(Config) ->
AppDir = ?config(apps, Config),
Expand Down