diff options
| author | Jean-Sébastien Pédron <[email protected]> | 2025-06-30 18:21:15 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <[email protected]> | 2025-07-22 12:52:47 +0200 |
| commit | ddb7199ee0662eaf96d0366c1deb4e3f764577c2 (patch) | |
| tree | d41ec75f48c1f15c923f6549e4ed4aeb23482f9e | |
| parent | c01dfaf1968f0b982e6772da0750ec8f88c04e9b (diff) | |
| download | erlang.mk-ddb7199ee0662eaf96d0366c1deb4e3f764577c2.tar.gz erlang.mk-ddb7199ee0662eaf96d0366c1deb4e3f764577c2.tar.bz2 erlang.mk-ddb7199ee0662eaf96d0366c1deb4e3f764577c2.zip | |
test: Bump some dependencies that fail to build with Erlang/OTP 28
| -rw-r--r-- | test/core_compat.mk | 4 | ||||
| -rw-r--r-- | test/core_deps.mk | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/test/core_compat.mk b/test/core_compat.mk index c8c570d..0e5a89e 100644 --- a/test/core_compat.mk +++ b/test/core_compat.mk @@ -163,7 +163,7 @@ core-compat-rebar-deps-git-tag: init $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v $i "Add Cowboy as a dependency" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy = git https://github.com/ninenines/cowboy 2.9.0\n"}' $(APP)/Makefile + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy\ndep_cowboy = git https://github.com/ninenines/cowboy 2.13.0\n"}' $(APP)/Makefile $i "Run 'make rebar.config'" $t $(MAKE) -C $(APP) rebar.config $v @@ -174,7 +174,7 @@ core-compat-rebar-deps-git-tag: init $i "Check that Cowboy is listed in rebar.config with a tag" $t $(ERL) -eval " \ {ok, C} = file:consult(\"$(APP)/rebar.config\"), \ - {_, [{cowboy, _, {git, _, {tag, \"2.9.0\"}}}]} = lists:keyfind(deps, 1, C), \ + {_, [{cowboy, _, {git, _, {tag, \"2.13.0\"}}}]} = lists:keyfind(deps, 1, C), \ halt()" $i "Distclean the application" diff --git a/test/core_deps.mk b/test/core_deps.mk index ace58c9..02eff53 100644 --- a/test/core_deps.mk +++ b/test/core_deps.mk @@ -161,8 +161,8 @@ core-deps-cache-git-reuse: init $t cp ../erlang.mk $(APP)_2/ $t $(MAKE) -C $(APP)_2 -f erlang.mk bootstrap-lib $v - $i "Add Cowlib 2.0.0 to the list of dependencies" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowlib\ndep_cowlib = git \$$(pkg_cowlib_repo) 2.0.0\n"}' $(APP)_2/Makefile + $i "Add Cowlib 2.15.0 to the list of dependencies" + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowlib\ndep_cowlib = git \$$(pkg_cowlib_repo) 2.15.0\n"}' $(APP)_2/Makefile $i "Add CACHE_DEPS = 1 to the Makefile" $t perl -ni.bak -e 'print;if ($$.==1) {print "CACHE_DEPS = 1\n"}' $(APP)_2/Makefile @@ -182,8 +182,8 @@ core-deps-cache-git-reuse: init $i "Check that $(APP)_1 cloned Cowlib 1.0.0" $t test "$$(cat $(APP)_1/deps/cowlib/.git/HEAD)" = "d544a494af4dbc810fc9c15eaf5cc050cced1501" - $i "Check that $(APP)_2 cloned Cowlib 2.0.0" - $t test "$$(cat $(APP)_2/deps/cowlib/.git/HEAD)" = "bd37be4d3b065600c3b76b492535e76e5d413fc1" + $i "Check that $(APP)_2 cloned Cowlib 2.15.0" + $t test "$$(cat $(APP)_2/deps/cowlib/.git/HEAD)" = "f8d0ad7f19b5dddd33cbfb089ebd2e2be2a81a5d" core-deps-cache-hex: init @@ -1264,8 +1264,8 @@ core-deps-order-first: init $t cp ../erlang.mk $(APP)/my_dep/ $t $(MAKE) -C $(APP)/my_dep/ -f erlang.mk bootstrap-lib $v - $i "Add Cowlib 2.0.0 to the list of dependencies for my_dep" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowlib\ndep_cowlib = git https://github.com/ninenines/cowlib 2.0.0\n"}' $(APP)/my_dep/Makefile + $i "Add Cowlib 2.15.0 to the list of dependencies for my_dep" + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowlib\ndep_cowlib = git https://github.com/ninenines/cowlib 2.15.0\n"}' $(APP)/my_dep/Makefile ifdef LEGACY $i "Add Cowboy and my_dep to the applications key in the .app.src file" @@ -1286,7 +1286,7 @@ endif [ok = application:load(App) || App <- [$(APP), cowboy, cowlib, my_dep, ranch]], \ {ok, Deps} = application:get_key($(APP), applications), \ true = lists:member(cowboy, Deps), \ - {ok, \"2.0.0\"} = application:get_key(cowlib, vsn), \ + {ok, \"2.15.0\"} = application:get_key(cowlib, vsn), \ halt()" # A higher-level dependency always wins. @@ -1297,8 +1297,8 @@ core-deps-order-top: init $t cp ../erlang.mk $(APP)/ $t $(MAKE) -C $(APP) -f erlang.mk bootstrap-lib $v - $i "Add Cowboy package and Cowlib 2.0.0 to the list of dependencies" - $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy cowlib\ndep_cowlib = git https://github.com/ninenines/cowlib 2.0.0\n"}' $(APP)/Makefile + $i "Add Cowboy package and Cowlib 2.15.0 to the list of dependencies" + $t perl -ni.bak -e 'print;if ($$.==1) {print "DEPS = cowboy cowlib\ndep_cowlib = git https://github.com/ninenines/cowlib 2.15.0\n"}' $(APP)/Makefile ifdef LEGACY $i "Add Cowboy to the applications key in the .app.src file" @@ -1318,7 +1318,7 @@ endif [ok = application:load(App) || App <- [$(APP), cowboy, cowlib, ranch]], \ {ok, Deps} = application:get_key($(APP), applications), \ true = lists:member(cowboy, Deps), \ - {ok, \"2.0.0\"} = application:get_key(cowlib, vsn), \ + {ok, \"2.15.0\"} = application:get_key(cowlib, vsn), \ halt()" ifndef LEGACY |