Skip to content

Commit

Permalink
bump gdn go-flags twentythousandtonnesofcrudeoil
Browse files Browse the repository at this point in the history
* Also add build-gdn-linux CI scripts

[finishes #126676279]

Submodule src/code.cloudfoundry.org/gdn 0000000...33695b7 (new submodule)
Submodule src/github.com/jessevdk/go-flags 6b9493b..8bc97d6:
  > Show how to exit(0) on --help in example
  > Output --help message to stdout instead of stderr
  > Merge pull request #197 from kkolman/fix_test_windows
  > Merge pull request #201 from bengadbois/patch-1
  > Merge pull request #200 from Liamraystanley/patch-1
  > Add line to doc for 'forceposix' build tag
  > Merge pull request #193 from XenoPhex/add-force-posix
  > Add accessor for struct field of the option
  > Allow passing negative number to a signed number option
  > Merge pull request #163 from pierrec/master
  > Run go fmt
  > Add specification of required rest arg range
  > Merge pull request #187 from laurent22/patch-1
  > Ensure to propagate convert error in parser
  > Merge pull request #177 from blampe/arg-wrap
  > Merge pull request #173 from blampe/man
  > Fix various linting warnings
  > [travis] Bump go version to 1.6
  > [travis] Remove go get for vet
  > Do not parse commands after seeing a non-option non-command arg
  > Run go fmt
  > Do not complete hidden flags
  > Execute CommandHandler also if there is no command to run
  > Add Parser.CommandHandler to run before executing a command
Submodule src/github.com/vito/twentythousandtonnesofcrudeoil 0000000...3e53686 (new submodule)
  • Loading branch information
teddyking committed Dec 8, 2016
1 parent 7ba6fb1 commit 464a97b
Show file tree
Hide file tree
Showing 8 changed files with 98 additions and 2 deletions.
8 changes: 8 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -185,3 +185,11 @@
path = src/github.com/st3v/glager
url = https://github.com/st3v/glager
branch = master
[submodule "src/github.com/vito/twentythousandtonnesofcrudeoil"]
path = src/github.com/vito/twentythousandtonnesofcrudeoil
url = https://github.com/vito/twentythousandtonnesofcrudeoil
branch = master
[submodule "src/code.cloudfoundry.org/gdn"]
path = src/code.cloudfoundry.org/gdn
url = https://github.com/cloudfoundry/gdn
branch = master
15 changes: 15 additions & 0 deletions ci/build-gdn-linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
platform: linux

image_resource:
type: docker-image
source: {repository: concourse/bin-ci}

inputs:
- name: gr-release-develop

outputs:
- name: binary

run:
path: gr-release-develop/ci/scripts/build-gdn-linux
65 changes: 65 additions & 0 deletions ci/scripts/build-gdn-linux
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
#!/bin/bash

# This script is almost entirely based on
# https://github.com/concourse/bin/blob/master/ci/build-linux and
# https://github.com/concourse/bin/blob/master/scripts/build-linux

set -e -u -x

export GOPATH=$PWD/gopath:$PWD/gr-release-develop
export PATH=$PWD/gopath/bin:$PWD/gr-release-develop:$PATH

go get github.com/jteeuwen/go-bindata/go-bindata

LINUX_ASSETS=$PWD/linux

rm -rf $LINUX_ASSETS
mkdir -p $LINUX_ASSETS

mkdir -p $LINUX_ASSETS/bin
cp /opt/static-assets/tar $LINUX_ASSETS/bin/tar

cp -a /opt/static-assets/iptables $LINUX_ASSETS/iptables

# go-bindata does weird stuff with symlinks. we only care about iptables anyway
rm $LINUX_ASSETS/iptables/sbin/*
rm -r $LINUX_ASSETS/iptables/bin
cp -aL /opt/static-assets/iptables/sbin/iptables $LINUX_ASSETS/iptables/sbin/iptables

pushd gr-release-develop
# workaround 'mv /root/.tmp/... /tmp/...: invalid cross-device link'
HOME=$PWD bosh sync-blobs

(
set -e -u -x

export GOPATH=$PWD

go install code.cloudfoundry.org/guardian/cmd/dadoo
go install code.cloudfoundry.org/guardian/cmd/init

pushd src/github.com/opencontainers/runc
PKG_CONFIG_PATH=/opt/static-assets/libseccomp/lib/pkgconfig \
GOPATH=$PWD/Godeps/_workspace:$GOPATH \
BUILDTAGS=seccomp \
make static

mv runc $LINUX_ASSETS/bin
popd

pushd src/code.cloudfoundry.org/guardian/rundmc/nstar
make
mv nstar $LINUX_ASSETS/bin
popd

cp bin/{init,dadoo} $LINUX_ASSETS/bin
)
popd

go-bindata -nomemcopy -pkg bindata -o gr-release-develop/src/code.cloudfoundry.org/gdn/bindata/bindata.go linux/...

# must be built with 'daemon' flag because of docker packages :|
go build \
-tags daemon \
-o binary/gdn_linux_amd64 \
code.cloudfoundry.org/gdn/cmd/gdn
6 changes: 6 additions & 0 deletions scripts/gdn-deps
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash
ROOT_DIR_PATH=$(cd $(dirname $0)/.. && pwd)

gosub list \
-a code.cloudfoundry.org/gdn/... \
-a github.com/vito/twentythousandtonnesofcrudeoil/...
2 changes: 1 addition & 1 deletion scripts/sync-submodule-config
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ ROOT_DIR_PATH=$(cd $(dirname $0)/.. && pwd)

# fail fast if gosub is not installed
which gosub
($ROOT_DIR_PATH/scripts/guardian-deps; echo "github.com/opencontainers/runc") | xargs gosub sync
($ROOT_DIR_PATH/scripts/guardian-deps; $ROOT_DIR_PATH/scripts/gdn-deps; echo "github.com/opencontainers/runc") | xargs gosub sync
1 change: 1 addition & 0 deletions src/code.cloudfoundry.org/gdn
Submodule gdn added at 33695b
2 changes: 1 addition & 1 deletion src/github.com/jessevdk/go-flags
1 change: 1 addition & 0 deletions src/github.com/vito/twentythousandtonnesofcrudeoil

0 comments on commit 464a97b

Please sign in to comment.