Skip to content

Commit

Permalink
Merge pull request #2340 from tsloughter/bump-3.14.1
Browse files Browse the repository at this point in the history
Bump 3.14.1
  • Loading branch information
tsloughter authored Sep 3, 2020
2 parents 7e585a3 + f0333b9 commit 7b90faf
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ jobs:
- name: CT tests
run: ./rebar3 ct

- name: Upload Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: ./rebar3
asset_name: rebar3
asset_content_type: application/zip
# - name: Upload Release Asset
# id: upload-release-asset
# uses: actions/upload-release-asset@v1
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# upload_url: ${{ github.event.release.upload_url }}
# asset_path: ./rebar3
# asset_name: rebar3
# asset_content_type: application/zip

- name: Configure AWS credentials
if: "!github.event.release.prerelease"
Expand Down
2 changes: 1 addition & 1 deletion bootstrap
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ main(_) ->
bootstrap_rebar3(),

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

%% Because we are compiling files that are loaded already we want to silence
Expand Down
4 changes: 2 additions & 2 deletions rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{providers, "1.8.1"},
{getopt, "1.0.1"},
{bbmustache, "1.10.0"},
{relx, "4.0.0"},
{relx, "4.0.2"},
{cf, "0.3.1"},
{cth_readable, "1.4.8"},
{eunit_formatters, "0.5.0"}]}.
Expand All @@ -24,7 +24,7 @@

{escript_name, rebar3}.
{escript_wrappers_windows, ["cmd", "powershell"]}.
{escript_comment, "%%Rebar3 3.14.0\n"}.
{escript_comment, "%%Rebar3 3.14.1\n"}.
{escript_emu_args, "%%! +sbtu +A1\n"}.
%% escript_incl_extra is for internal rebar-private use only.
%% Do not use outside rebar. Config interface is not stable.
Expand Down
6 changes: 3 additions & 3 deletions rebar.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{<<"getopt">>,{pkg,<<"getopt">>,<<"1.0.1">>},0},
{<<"parse_trans">>,{pkg,<<"parse_trans">>,<<"3.3.0">>},0},
{<<"providers">>,{pkg,<<"providers">>,<<"1.8.1">>},0},
{<<"relx">>,{pkg,<<"relx">>,<<"4.0.0">>},0},
{<<"relx">>,{pkg,<<"relx">>,<<"4.0.2">>},0},
{<<"ssl_verify_fun">>,{pkg,<<"ssl_verify_fun">>,<<"1.1.6">>},0}]}.
[
{pkg_hash,[
Expand All @@ -21,7 +21,7 @@
{<<"getopt">>, <<"C73A9FA687B217F2FF79F68A3B637711BB1936E712B521D8CE466B29CBF7808A">>},
{<<"parse_trans">>, <<"09765507A3C7590A784615CFD421D101AEC25098D50B89D7AA1D66646BC571C1">>},
{<<"providers">>, <<"70B4197869514344A8A60E2B2A4EF41CA03DEF43CFB1712ECF076A0F3C62F083">>},
{<<"relx">>, <<"EB91A77B208F7794EC0E70CFCB02E9F76BB35940DDF87C1940F10D8190FD4877">>},
{<<"relx">>, <<"889F0D0D1CBD08581EFBFE4EC3894C11C562C47BBB9A4477049C10B81BD8C819">>},
{<<"ssl_verify_fun">>, <<"CF344F5692C82D2CD7554F5EC8FD961548D4FD09E7D22F5B62482E5AEAEBD4B0">>}]},
{pkg_hash_ext,[
{<<"bbmustache">>, <<"43EFFA3FD4BB9523157AF5A9E2276C493495B8459FC8737144AA186CB13CE2EE">>},
Expand All @@ -33,6 +33,6 @@
{<<"getopt">>, <<"53E1AB83B9CEB65C9672D3E7A35B8092E9BDC9B3EE80721471A161C10C59959C">>},
{<<"parse_trans">>, <<"17EF63ABDE837AD30680EA7F857DD9E7CED9476CDD7B0394432AF4BFC241B960">>},
{<<"providers">>, <<"E45745ADE9C476A9A469EA0840E418AB19360DC44F01A233304E118A44486BA0">>},
{<<"relx">>, <<"6C398119B8912ED5A579FDBF11426B8EE06E95ADB8830CBC9672DE816880F579">>},
{<<"relx">>, <<"21B5D01C78D832B2ED62F9796C77718270BA35432C2845059919FAD990C09E17">>},
{<<"ssl_verify_fun">>, <<"BDB0D2471F453C88FF3908E7686F86F9BE327D065CC1EC16FA4540197EA04680">>}]}
].
2 changes: 1 addition & 1 deletion src/rebar.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{application, rebar,
[{description, "Rebar: Erlang Build Tool"},
{vsn, "git"},
{vsn, "3.14.1"},
{modules, []},
{registered, []},
{applications, [kernel,
Expand Down

0 comments on commit 7b90faf

Please sign in to comment.