Skip to content

Commit 7b90faf

Browse files
authored
Merge pull request #2340 from tsloughter/bump-3.14.1
Bump 3.14.1
2 parents 7e585a3 + f0333b9 commit 7b90faf

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

.github/workflows/publish.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ jobs:
1919
- name: CT tests
2020
run: ./rebar3 ct
2121

22-
- name: Upload Release Asset
23-
id: upload-release-asset
24-
uses: actions/upload-release-asset@v1
25-
env:
26-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27-
with:
28-
upload_url: ${{ github.event.release.upload_url }}
29-
asset_path: ./rebar3
30-
asset_name: rebar3
31-
asset_content_type: application/zip
22+
# - name: Upload Release Asset
23+
# id: upload-release-asset
24+
# uses: actions/upload-release-asset@v1
25+
# env:
26+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
# with:
28+
# upload_url: ${{ github.event.release.upload_url }}
29+
# asset_path: ./rebar3
30+
# asset_name: rebar3
31+
# asset_content_type: application/zip
3232

3333
- name: Configure AWS credentials
3434
if: "!github.event.release.prerelease"

bootstrap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ main(_) ->
4343
bootstrap_rebar3(),
4444

4545
%% Build rebar.app from rebar.app.src
46-
{ok, App} = rebar_app_info:new(rebar, "3.14.0", filename:absname("_build/default/lib/rebar/")),
46+
{ok, App} = rebar_app_info:new(rebar, "3.14.1", filename:absname("_build/default/lib/rebar/")),
4747
rebar_otp_app:compile(rebar_state:new(), App),
4848

4949
%% Because we are compiling files that are loaded already we want to silence

rebar.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{providers, "1.8.1"},
99
{getopt, "1.0.1"},
1010
{bbmustache, "1.10.0"},
11-
{relx, "4.0.0"},
11+
{relx, "4.0.2"},
1212
{cf, "0.3.1"},
1313
{cth_readable, "1.4.8"},
1414
{eunit_formatters, "0.5.0"}]}.
@@ -24,7 +24,7 @@
2424

2525
{escript_name, rebar3}.
2626
{escript_wrappers_windows, ["cmd", "powershell"]}.
27-
{escript_comment, "%%Rebar3 3.14.0\n"}.
27+
{escript_comment, "%%Rebar3 3.14.1\n"}.
2828
{escript_emu_args, "%%! +sbtu +A1\n"}.
2929
%% escript_incl_extra is for internal rebar-private use only.
3030
%% Do not use outside rebar. Config interface is not stable.

rebar.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},0},
99
{<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.3.0">>},0},
1010
{<<"providers">>,{pkg,<<"providers">>,<<"1.8.1">>},0},
11-
{<<"relx">>,{pkg,<<"relx">>,<<"4.0.0">>},0},
11+
{<<"relx">>,{pkg,<<"relx">>,<<"4.0.2">>},0},
1212
{<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.6">>},0}]}.
1313
[
1414
{pkg_hash,[
@@ -21,7 +21,7 @@
2121
{<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>},
2222
{<<"parse_trans">>, <<"09765507A3C7590A784615CFD421D101AEC25098D50B89D7AA1D66646BC571C1">>},
2323
{<<"providers">>, <<"70B4197869514344A8A60E2B2A4EF41CA03DEF43CFB1712ECF076A0F3C62F083">>},
24-
{<<"relx">>, <<"EB91A77B208F7794EC0E70CFCB02E9F76BB35940DDF87C1940F10D8190FD4877">>},
24+
{<<"relx">>, <<"889F0D0D1CBD08581EFBFE4EC3894C11C562C47BBB9A4477049C10B81BD8C819">>},
2525
{<<"ssl_verify_fun">>, <<"CF344F5692C82D2CD7554F5EC8FD961548D4FD09E7D22F5B62482E5AEAEBD4B0">>}]},
2626
{pkg_hash_ext,[
2727
{<<"bbmustache">>, <<"43EFFA3FD4BB9523157AF5A9E2276C493495B8459FC8737144AA186CB13CE2EE">>},
@@ -33,6 +33,6 @@
3333
{<<"getopt">>, <<"53E1AB83B9CEB65C9672D3E7A35B8092E9BDC9B3EE80721471A161C10C59959C">>},
3434
{<<"parse_trans">>, <<"17EF63ABDE837AD30680EA7F857DD9E7CED9476CDD7B0394432AF4BFC241B960">>},
3535
{<<"providers">>, <<"E45745ADE9C476A9A469EA0840E418AB19360DC44F01A233304E118A44486BA0">>},
36-
{<<"relx">>, <<"6C398119B8912ED5A579FDBF11426B8EE06E95ADB8830CBC9672DE816880F579">>},
36+
{<<"relx">>, <<"21B5D01C78D832B2ED62F9796C77718270BA35432C2845059919FAD990C09E17">>},
3737
{<<"ssl_verify_fun">>, <<"BDB0D2471F453C88FF3908E7686F86F9BE327D065CC1EC16FA4540197EA04680">>}]}
3838
].

src/rebar.app.src

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
{application, rebar,
55
[{description, "Rebar: Erlang Build Tool"},
6-
{vsn, "git"},
6+
{vsn, "3.14.1"},
77
{modules, []},
88
{registered, []},
99
{applications, [kernel,

0 commit comments

Comments
 (0)