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

Bug 29143: fix build of obfs4 in nightly builds

parent 74bbaa04
......@@ -13,6 +13,11 @@ var:
use_container: 1
go_lib: git.torproject.org/pluggable-transports/goptlib.git
targets:
nightly:
version: master
tag_gpg_id: 0
input_files:
- project: container-image
- name: go
......
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
git_url: https://github.com/refraction-networking/utls
git_hash: a89e7e6da482a5a0db02578fc606ace9ccfbea62
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
build: '[% c("projects/go/var/build_go_lib") %]'
var:
container:
use_container: 1
go_lib: github.com/refraction-networking/utls
go_lib_deps:
- goxcrypto
input_files:
- project: container-image
- name: go
project: go
- name: goxcrypto
project: goxcrypto
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
git_url: https://go.googlesource.com/crypto
git_hash: 4ed45ec682102c643324fae5dff8dab085b6c300
git_hash: ff983b9c42bc9fbf91556e191cc8efb585c16908
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
build: '[% c("projects/go/var/build_go_lib") %]'
......@@ -11,9 +11,13 @@ var:
use_container: 1
go_lib: golang.org/x/crypto
go_lib_install:
- golang.org/x/crypto/chacha20poly1305
- golang.org/x/crypto/cryptobyte
- golang.org/x/crypto/curve25519
- golang.org/x/crypto/hkdf
- golang.org/x/crypto/nacl/secretbox
go_lib_deps:
- goxsys
targets:
nightly:
......@@ -23,3 +27,5 @@ input_files:
- project: container-image
- name: go
project: go
- name: goxsys
project: goxsys
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
git_url: https://github.com/golang/sys
git_hash: 11f53e03133963fb11ae0588e08b5e0b85be8be5
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
build: '[% c("projects/go/var/build_go_lib") %]'
var:
container:
use_container: 1
go_lib: golang.org/x/sys
go_lib_install:
- golang.org/x/sys/cpu
input_files:
- project: container-image
- name: go
project: go
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
git_url: https://github.com/golang/text
# v0.3.0
git_hash: f21a4dfb5e38f5895301dc265a8def02365cc3d0
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
build: '[% c("projects/go/var/build_go_lib") %]'
var:
container:
use_container: 1
go_lib: golang.org/x/text
input_files:
- project: container-image
- name: go
project: go
......@@ -11,6 +11,10 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/siphash') %]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxcrypto') %]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxnet') %]
[% IF c("var/nightly") -%]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/goutls') %]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxtext') %]
[% END -%]
mkdir -p /var/tmp/build
tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
......
......@@ -32,3 +32,9 @@ input_files:
project: goxcrypto
- name: goxnet
project: goxnet
- name: goutls
project: goutls
enable: '[% c("var/nightly") %]'
- name: goxtext
project: goxtext
enable: '[% c("var/nightly") %]'
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
git_url: https://github.com/dchest/siphash.git
git_hash: 42ba037e748c9062a75e0924705c43b893edefcd
git_hash: 34f201214d993633bb24f418ba11736ab8b55aa7
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
build: '[% c("projects/go/var/build_go_lib") %]'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment