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

[boklm (@boklm)]

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:

- projects/conjure/config
- projects/go/config
- projects/lyrebird/config
- projects/snowflake/config
- projects/tor-android-service/config
- projects/tor-onion-proxy-library/config
- projects/webtunnel/config


Changes:

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


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


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


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


=====================================
projects/tor-android-service/config
=====================================
@@ -26,19 +26,19 @@ input_files:
   - project: tor-expert-bundle
     name: tor-expert-bundle-armv7
     target_replace:
-      '^torbrowser-.*': 'torbrowser-android-armv7'
+      '^torbrowser-(?!testbuild).*': 'torbrowser-android-armv7'
   - project: tor-expert-bundle
     name: tor-expert-bundle-aarch64
     target_replace:
-      '^torbrowser-.*': 'torbrowser-android-aarch64'
+      '^torbrowser-(?!testbuild).*': 'torbrowser-android-aarch64'
   - project: tor-expert-bundle
     name: tor-expert-bundle-x86
     target_replace:
-      '^torbrowser-.*': 'torbrowser-android-x86'
+      '^torbrowser-(?!testbuild).*': 'torbrowser-android-x86'
   - project: tor-expert-bundle
     name: tor-expert-bundle-x86_64
     target_replace:
-      '^torbrowser-.*': 'torbrowser-android-x86_64'
+      '^torbrowser-(?!testbuild).*': 'torbrowser-android-x86_64'
   - URL: 'https://dl.google.com/dl/android/studio/jetifier-zips/1.0.0-beta10/jetifier-standalone.zip'
     name: jetifier
     sha256sum: 38186db9c9d1b745890b3d35c0667da1cac146ceb3c26aae5bf0802119472c1b


=====================================
projects/tor-onion-proxy-library/config
=====================================
@@ -21,19 +21,19 @@ input_files:
   - project: tor-expert-bundle
     name: tor-expert-bundle-armv7
     target_replace:
-      '^torbrowser-.*': 'torbrowser-android-armv7'
+      '^torbrowser-(?!testbuild).*': 'torbrowser-android-armv7'
   - project: tor-expert-bundle
     name: tor-expert-bundle-aarch64
     target_replace:
-      '^torbrowser-.*': 'torbrowser-android-aarch64'
+      '^torbrowser-(?!testbuild).*': 'torbrowser-android-aarch64'
   - project: tor-expert-bundle
     name: tor-expert-bundle-x86
     target_replace:
-      '^torbrowser-.*': 'torbrowser-android-x86'
+      '^torbrowser-(?!testbuild).*': 'torbrowser-android-x86'
   - project: tor-expert-bundle
     name: tor-expert-bundle-x86_64
     target_replace:
-      '^torbrowser-.*': 'torbrowser-android-x86_64'
+      '^torbrowser-(?!testbuild).*': 'torbrowser-android-x86_64'
   - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
     name: gradle-dependencies
     exec: '[% INCLUDE "fetch-gradle-dependencies" %]'


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



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d8fe33ad5f67573fcd82f425b3e1dbe27c2b7aa4

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d8fe33ad5f67573fcd82f425b3e1dbe27c2b7aa4
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20230801/ef8b5d14/attachment-0001.htm>