morgan pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

1 changed file:

Changes:

  • tools/browser/generate-bugzilla-triage-csv
    ... ... @@ -4,7 +4,7 @@
    4 4
     browser_label="Apps::Product::TorBrowser"
    
    5 5
     esr_label="esr-next"
    
    6 6
     priority_label="Priority::Blocker"
    
    7
    -impact_label="Impact::Unknown"
    
    7
    +impact_label="Apps::Impact::Unknown"
    
    8 8
     type_label="Apps::Type::Audit"
    
    9 9
     
    
    10 10
     # milestone for the next major Tor Browser release
    
    ... ... @@ -16,17 +16,15 @@ function echoerr() { echo "$@" 1>&2; }
    16 16
     script_dir=$(dirname "${BASH_ARGV0:-$0}")
    
    17 17
     
    
    18 18
     # help dialog
    
    19
    -if [ "$#" -ne 4 ]; then
    
    20
    -    echoerr "Usage: $0 <ff-version> <begin-commit> <end-commit> <gitlab-audit-issue>"
    
    19
    +if [ "$#" -ne 2 ]; then
    
    20
    +    echoerr "Usage: $0 <ff-version> <gitlab-audit-issue>"
    
    21 21
         echoerr
    
    22 22
         echoerr "ff-version             rapid-release Firefox version to audit"
    
    23
    -    echoerr "begin-commit           starting firefox commit of this Firefox version"
    
    24
    -    echoerr "end-commit             ending firefox commit of this Firefox version"
    
    25 23
         echoerr "gitlab-audit-issue     tor-browser GitLab issue number for this audit"
    
    26 24
         echoerr ""
    
    27 25
         echoerr "Example:"
    
    28 26
         echoerr ""
    
    29
    -    echoerr "$0 129 FIREFOX_NIGHTLY_128_END FIREFOX_NIGHTLY_129_END 43303"
    
    27
    +    echoerr "$0 129 43303"
    
    30 28
         exit 1
    
    31 29
     fi
    
    32 30
     
    
    ... ... @@ -56,10 +54,10 @@ check_exists wget
    56 54
     
    
    57 55
     # Assign arguments to named variables
    
    58 56
     firefox_version=$1
    
    59
    -git_begin=$2
    
    60
    -git_end=$3
    
    61
    -audit_issue=$4
    
    62
    -reviewers="${@:5}"
    
    57
    +firefox_old_version=$((firefox_version - 1))
    
    58
    +audit_issue=$2
    
    59
    +git_begin="FIREFOX_NIGHTLY_${firefox_old_version}_END"
    
    60
    +git_end="FIREFOX_NIGHTLY_${firefox_version}_END"
    
    63 61
     
    
    64 62
     # Check valid Firefox version
    
    65 63
     if ! [[ "${firefox_version}" =~ ^[1-9][0-9]{2}$ ]]; then
    
    ... ... @@ -151,7 +149,12 @@ git log --format='%s' $git_begin..$git_end \
    151 149
             printf ",\n" >> "${git_json}"
    
    152 150
         fi
    
    153 151
     
    
    154
    -    printf "  { \"component\": \"Unknown\", \"id\": %s, \"summary\": \"%s\" }" ${id} "${summary}" >> "${git_json}"
    
    152
    +    component="Unknown"
    
    153
    +    if [[ "${summary}" =~ webcompat ]]; then
    
    154
    +        component="Web Compatibility"
    
    155
    +    fi
    
    156
    +
    
    157
    +    printf "  { \"component\": \"%s\", \"id\": %s, \"summary\": \"%s\" }" "${component}" ${id} "${summary}" >> "${git_json}"
    
    155 158
     done
    
    156 159
     printf "\n]\n" >> "${git_json}"
    
    157 160
     
    
    ... ... @@ -171,7 +174,6 @@ bugzilla_json_query="https://bugzilla.mozilla.org/rest/bug?include_fields=id,com
    171 174
     
    
    172 175
     wget "${bugzilla_json_query}" -O ${bugzilla_json}
    
    173 176
     
    
    174
    -
    
    175 177
     #
    
    176 178
     # Create Union of these two sets of issues
    
    177 179
     #