[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 40905: Avoid replacing .*browser-testbuild targets

Title: GitLab

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

Commits:

  • d8fe33ad
    by Nicolas Vigier at 2023-08-01T10:53:55+02:00 
    Bug 40905: Avoid replacing .*browser-testbuild targets

In some places we use target_replace to replace .*browser-.* targets, in
order to replace the torbrowser-$os-$arch targets. However the regexp we
used would also replace the torbrowser-testbuild target, so we need to
update the regexp to exclude the testbuild target.

7 changed files:

Changes:

  • projects/conjure/config
    ... ... @@ -21,4 +21,4 @@ steps:
    21 21 
             norec:
    22 22 
               sha256sum: 2b403d6edf075777003bf2194a43fb178a28a4eaa7d23ec8f104563d9bbd7e53
    23 23 
             target_replace:
    24 
    -          '^torbrowser-.*': 'torbrowser-linux-x86_64'
    24 
    +          '^torbrowser-(?!testbuild).*': 'torbrowser-linux-x86_64'

  • projects/go/config
    ... ... @@ -123,6 +123,6 @@ input_files:
    123 123 
       - project: go-bootstrap
    124 124 
         name: go-bootstrap
    125 125 
         target_replace:
    126 
    -      '^.*browser-.*': 'basebrowser-linux-x86_64'
    126 
    +      '^.*browser-(?!testbuild).*': 'basebrowser-linux-x86_64'
    127 127 
       - filename: 0001-Use-fixed-go-build-tmp-directory.patch
    128 128 
         enable: '[% c("var/android") %]'

  • projects/lyrebird/config
    ... ... @@ -35,4 +35,4 @@ steps:
    35 35 
             norec:
    36 36 
               sha256sum: '[% c("var/go_vendor_sha256sum") %]'
    37 37 
             target_replace:
    38 
    -          '^torbrowser-.*': 'torbrowser-linux-x86_64'
    38 
    +          '^torbrowser-(?!testbuild).*': 'torbrowser-linux-x86_64'

  • projects/snowflake/config
    ... ... @@ -22,4 +22,4 @@ steps:
    22 22 
             norec:
    23 23 
               sha256sum: 62f9065881f5a3cbe5ea5a9802e961e1821d9e468cb2a85ebab1e8afcc0cc953
    24 24 
             target_replace:
    25 
    -          '^torbrowser-.*': 'torbrowser-linux-x86_64'
    25 
    +          '^torbrowser-(?!testbuild).*': 'torbrowser-linux-x86_64'

  • projects/tor-android-service/config
    ... ... @@ -26,19 +26,19 @@ input_files:
    26 26 
       - project: tor-expert-bundle
    27 27 
         name: tor-expert-bundle-armv7
    28 28 
         target_replace:
    29 
    -      '^torbrowser-.*': 'torbrowser-android-armv7'
    29 
    +      '^torbrowser-(?!testbuild).*': 'torbrowser-android-armv7'
    30 30 
       - project: tor-expert-bundle
    31 31 
         name: tor-expert-bundle-aarch64
    32 32 
         target_replace:
    33 
    -      '^torbrowser-.*': 'torbrowser-android-aarch64'
    33 
    +      '^torbrowser-(?!testbuild).*': 'torbrowser-android-aarch64'
    34 34 
       - project: tor-expert-bundle
    35 35 
         name: tor-expert-bundle-x86
    36 36 
         target_replace:
    37 
    -      '^torbrowser-.*': 'torbrowser-android-x86'
    37 
    +      '^torbrowser-(?!testbuild).*': 'torbrowser-android-x86'
    38 38 
       - project: tor-expert-bundle
    39 39 
         name: tor-expert-bundle-x86_64
    40 40 
         target_replace:
    41 
    -      '^torbrowser-.*': 'torbrowser-android-x86_64'
    41 
    +      '^torbrowser-(?!testbuild).*': 'torbrowser-android-x86_64'
    42 42 
       - URL: 'https://dl.google.com/dl/android/studio/jetifier-zips/1.0.0-beta10/jetifier-standalone.zip'
    43 43 
         name: jetifier
    44 44 
         sha256sum: 38186db9c9d1b745890b3d35c0667da1cac146ceb3c26aae5bf0802119472c1b

  • projects/tor-onion-proxy-library/config
    ... ... @@ -21,19 +21,19 @@ input_files:
    21 21 
       - project: tor-expert-bundle
    22 22 
         name: tor-expert-bundle-armv7
    23 23 
         target_replace:
    24 
    -      '^torbrowser-.*': 'torbrowser-android-armv7'
    24 
    +      '^torbrowser-(?!testbuild).*': 'torbrowser-android-armv7'
    25 25 
       - project: tor-expert-bundle
    26 26 
         name: tor-expert-bundle-aarch64
    27 27 
         target_replace:
    28 
    -      '^torbrowser-.*': 'torbrowser-android-aarch64'
    28 
    +      '^torbrowser-(?!testbuild).*': 'torbrowser-android-aarch64'
    29 29 
       - project: tor-expert-bundle
    30 30 
         name: tor-expert-bundle-x86
    31 31 
         target_replace:
    32 
    -      '^torbrowser-.*': 'torbrowser-android-x86'
    32 
    +      '^torbrowser-(?!testbuild).*': 'torbrowser-android-x86'
    33 33 
       - project: tor-expert-bundle
    34 34 
         name: tor-expert-bundle-x86_64
    35 35 
         target_replace:
    36 
    -      '^torbrowser-.*': 'torbrowser-android-x86_64'
    36 
    +      '^torbrowser-(?!testbuild).*': 'torbrowser-android-x86_64'
    37 37 
       - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
    38 38 
         name: gradle-dependencies
    39 39 
         exec: '[% INCLUDE "fetch-gradle-dependencies" %]'

  • projects/webtunnel/config
    ... ... @@ -21,4 +21,4 @@ steps:
    21 21 
             norec:
    22 22 
               sha256sum: e3b5a9b3c3939aafa5389246f3a7a7e78d70fe623bed495f99c39cc37bbbe645
    23 23 
             target_replace:
    24 
    -          '^torbrowser-.*': 'torbrowser-linux-x86_64'
    24 
    +          '^torbrowser-(?!testbuild).*': 'torbrowser-linux-x86_64'

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits