Commit 88c9740a authored by morgan's avatar morgan 😸 Committed by morgan
Browse files

Bug 41269: Remove Snowflake pluggable-transport from legacy Windows builds

parent dbde010e

projects/go/config

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ targets: 
  windows:

    var:

      GOOS: windows

      use_go_1_20: '[% c("origin_project") != "snowflake" %]'

      use_go_1_20: 1

  windows-i686:

    var:

      GOARCH: 386

projects/tor-expert-bundle/build

+9 −0
Original line number Diff line number Diff line
@@ -14,12 +14,21 @@ cd tor 
mkdir pluggable_transports && cd pluggable_transports



tar -xkf $rootdir/[% c('input_files_by_name/lyrebird') %]

# do not include snowflake-client on Windows targets

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

tar -xkf $rootdir/[% c('input_files_by_name/snowflake') %]

[% END %]

tar -xkf $rootdir/[% c('input_files_by_name/conjure') %]



# add per-platform pt extension

awk '{gsub(/\$\{pt_extension\}/, "[% c("var/pt_extension") %]"); print}' $rootdir/pt_config.json > pt_config.json



# remove snowflake entires on Windows targets

[% IF c("var/windows") -%]

# remove snowflake pt and bridge entries

jq 'del(.pluggableTransports.snowflake, .bridges.snowflake)' pt_config.json > tmp.pt_config.json && mv tmp.pt_config.json pt_config.json

[% END %]



cd $distdir



# package a .aar on android

projects/tor-expert-bundle/config

+5 −0
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ version: '[% c("var/torbrowser_version") %]' 
container:

  use_container: 1



var:

  deps:

  - jq



targets:

  windows:

    var:
@@ -18,6 +22,7 @@ input_files: 
    project: lyrebird

  - name: snowflake

    project: snowflake

    enable: '[% !c("var/windows") %]'

  - name: conjure

    project: conjure

  - filename: pt_config.json