Unverified Commit 98308c32 authored by boklm's avatar boklm
Browse files

Bug 41280: Update download-android-*.json files for android-only releases

parent 580855da

projects/release/update_responses_config.yml

+3 −0
Original line number Original line Diff line number Diff line 
---

---

tmp_dir: '[% c("tmp_dir") %]'

tmp_dir: '[% c("tmp_dir") %]'

create_downloads_json: 1

create_downloads_json: 1

[% IF !c("var/browser_platforms/signing_desktop") -%]

create_downloads_json_only: 1

[% END -%]

appname_marfile: '[% c("var/project-name") %]'

appname_marfile: '[% c("var/project-name") %]'

appname_bundle: '[% c("var/project-name") %]'

appname_bundle: '[% c("var/project-name") %]'

releases_dir: [% path(c('output_dir')) %][% IF ! c("var/nightly") %]/[% IF c("var/unsigned_releases_dir") -%]un[% END %]signed[% END %]

releases_dir: [% path(c('output_dir')) %][% IF ! c("var/nightly") %]/[% IF c("var/unsigned_releases_dir") -%]un[% END %]signed[% END %]

tools/signing/do-all-signing

+1 −1
Original line number Original line Diff line number Diff line
@@ -275,6 +275,6 @@ do_step download-unsigned-sha256sums-gpg-signatures-from-people-tpo 
do_step sync-local-to-staticiforme

do_step sync-local-to-staticiforme

do_step sync-scripts-to-staticiforme

do_step sync-scripts-to-staticiforme

do_step staticiforme-prepare-cdn-dist-upload

do_step staticiforme-prepare-cdn-dist-upload

! is_legacy && [ -n "$platform_desktop" ] && \

! is_legacy && \

  do_step upload-update_responses-to-staticiforme

  do_step upload-update_responses-to-staticiforme

do_step finished-signing-clean-linux-signer
 
do_step finished-signing-clean-linux-signer

tools/update-responses/update_responses

+14 −10
Original line number Original line Diff line number Diff line
@@ -464,6 +464,7 @@ sub write_downloads_json { 
    my $versions = as_array($config->{channels}{$channel});

    my $versions = as_array($config->{channels}{$channel});

    my ($version) = @$versions;

    my ($version) = @$versions;

    my $tag = get_config($config, $version, 'any', 'tag');

    my $tag = get_config($config, $version, 'any', 'tag');

    if (!$config->{create_downloads_json_only}) {

        my $data = {

        my $data = {

            version => "$version",

            version => "$version",

            tag => "$tag",

            tag => "$tag",
@@ -472,6 +473,7 @@ sub write_downloads_json { 
        };

        };

        write_htdocs($channel, '.', 'downloads.json',

        write_htdocs($channel, '.', 'downloads.json',

            JSON->new->utf8->canonical->pretty->encode($data));

            JSON->new->utf8->canonical->pretty->encode($data));

    }

    my $pp_downloads = get_perplatform_downloads($config, $version, $tag);

    my $pp_downloads = get_perplatform_downloads($config, $version, $tag);

    foreach my $os (keys %{$pp_downloads}) {

    foreach my $os (keys %{$pp_downloads}) {

        write_htdocs($channel, '.', "download-$os.json",

        write_htdocs($channel, '.', "download-$os.json",
@@ -634,8 +636,10 @@ my %actions = ( 
        exit_error "Wrong arguments" unless @ARGV == 1;

        exit_error "Wrong arguments" unless @ARGV == 1;

        my $channel = $ARGV[0];

        my $channel = $ARGV[0];

        exit_error "Unknown channel $channel" unless $config->{channels}{$channel};

        exit_error "Unknown channel $channel" unless $config->{channels}{$channel};

        if (!$config->{create_downloads_json_only}) {

          write_responses($config, $channel);

          write_responses($config, $channel);

          write_htaccess($config, $channel);

          write_htaccess($config, $channel);

        }

        write_downloads_json($config, $channel);

        write_downloads_json($config, $channel);

    },

    },

    gen_incrementals => sub {

    gen_incrementals => sub {