Unverified Commit c9d42e1a authored by boklm's avatar boklm
Browse files

Bug 40849: Use `go mod vendor` to fetch go dependencies 

Update conjure, webtunnel, obfs4 and snowflake to use `go mod vendor` to
fetch dependencies.

We still have some go module projects, for dependencies of
projects/ncprop279/config, which doesn't have a `go.sum` file yet.
parent 9ce60dc8

Makefile

+15 −0
Original line number Diff line number Diff line
@@ -592,6 +592,21 @@ cargo_vendor-cbindgen: submodule-update 
cargo_vendor-uniffi-rs: submodule-update

	$(rbm) build uniffi-rs --step cargo_vendor --target nightly --target torbrowser-linux-x86_64



go_vendor-snowflake-alpha: submodule-update

	$(rbm) build snowflake --step go_vendor --target alpha --target torbrowser-linux-x86_64



go_vendor-conjure-alpha: submodule-update

	$(rbm) build conjure --step go_vendor --target alpha --target torbrowser-linux-x86_64



go_vendor-webtunnel-alpha: submodule-update

	$(rbm) build webtunnel --step go_vendor --target alpha --target torbrowser-linux-x86_64



go_vendor-obfs4-alpha: submodule-update

	$(rbm) build obfs4 --step go_vendor --target alpha --target torbrowser-linux-x86_64



go_vendor-obfs4-nightly: submodule-update

	$(rbm) build obfs4 --step go_vendor --target nightly --target torbrowser-linux-x86_64





##################

# Common Targets #

doc/how-to-update-go-dependencies.txt

0 → 100644
+10 −0
Original line number Diff line number Diff line 
When the dependencies of a go project ($project in the following lines)

are changing:



- the go.mod and go.sum files in $project.git are updated

- in tor-browser-build, run `make go_vendor-$project-alpha` or

  `make go_vendor-$project-nightly`

- find the new file created in directory `out/$project/go_vendor` and

  compute its sha256sum

- in `projects/$project/config`, update `norec/sha256sum` for `go_vendor`

  in `input_files`.

projects/agouti/config

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
# vim: filetype=yaml sw=2

version: '[% c("abbrev") %]'

git_url: https://github.com/sclevine/agouti

git_hash: e3f6c97a4077ad821daab49db8172cf9f6690faf #v3.0.0

filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'



build: '[% c("projects/go/var/build_go_lib") %]'



container:

  use_container: 1



var:

  go_lib: github.com/sclevine/agouti



input_files:

  - project: container-image

  - name: go

    project: go

projects/andybalholm-brotli/config

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
# vim: filetype=yaml sw=2

version: 1.0.4

git_url:  https://github.com/andybalholm/brotli.git

git_hash: '1d750214c25205863625bb3eb8190a51b2cef26d'

filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'



container:

  use_container: 1



build: '[% c("projects/go/var/build_go_lib") %]'



var:

  go_lib: github.com/andybalholm/brotli



input_files:

  - project: container-image

  - name: go

    project: go

projects/browser/config

+2 −2
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ input_files: 
  - project: tor-expert-bundle

    name: tor-expert-bundle-aarch64

    enable: '[% c("var/macos_universal") && c("var/tor-browser") %]'

    target_prepend:

      - macos-aarch64

    target_replace:

      '^torbrowser-macos.*': torbrowser-macos-aarch64

  - project: fonts

    name: fonts

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