Skip to content
This repository was archived by the owner on Feb 20, 2020. It is now read-only.

Repository restructuring #126

Open
wants to merge 59 commits into
base: master
Choose a base branch
from
Open

Repository restructuring #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
0527f66
Moved files around
petemoore Oct 4, 2018
276ef87
fixes
petemoore Oct 4, 2018
c9172ea
Merge branch 'master' into directory-cleanup
petemoore Oct 4, 2018
fce7966
Moved stuff around
petemoore Oct 5, 2018
cb38464
cleanup
petemoore Oct 5, 2018
0033a62
Fixed git import paths
petemoore Oct 5, 2018
bbbdaf0
Fixed .taskcluster.yml
petemoore Oct 5, 2018
39b6e7c
fixes
petemoore Oct 5, 2018
e65ef8e
fixed build scripts
petemoore Oct 5, 2018
807f111
fixed path for code generation
petemoore Oct 5, 2018
033f337
test all packages
petemoore Oct 5, 2018
8c6be85
moved testdata into generic-worker package folder
petemoore Oct 5, 2018
1e5b30f
fix gotestcover.sh to search for packages from root directory of proj…
petemoore Oct 5, 2018
7c4b4ca
updates
petemoore Oct 5, 2018
c0c052c
fixes
petemoore Oct 5, 2018
9a1f5ce
fixed ldflags parameter when building
petemoore Oct 5, 2018
92d2d93
cleanup
petemoore Oct 5, 2018
76fcb19
fix
petemoore Oct 5, 2018
a01a349
cleanup
petemoore Oct 5, 2018
a48d461
fix
petemoore Oct 5, 2018
52cb986
cleanup
petemoore Oct 5, 2018
3f178ec
fixes
petemoore Oct 5, 2018
1f3c896
continue publishing to s3://schemas.taskcluster.net/generic-worker/v1…
petemoore Oct 6, 2018
d98115d
Mention bug 1456357 in yaml comment so line doesn't get added again
petemoore Oct 6, 2018
f9eada5
wip
petemoore Oct 8, 2018
76c0c6b
updated gecko worker type definitions
petemoore Oct 8, 2018
a05fd71
wip
petemoore Oct 8, 2018
becd6c0
wip
petemoore Oct 8, 2018
ba86699
fix nss scripts to work with new directory layout
petemoore Oct 8, 2018
5bc9bf9
fix nss script
petemoore Oct 8, 2018
a02d5e0
fix
petemoore Oct 8, 2018
6262423
fix
petemoore Oct 8, 2018
4ea5bce
fix
petemoore Oct 8, 2018
489738a
wip
petemoore Oct 8, 2018
806e694
try this
petemoore Oct 8, 2018
a0773c5
fix
petemoore Oct 8, 2018
b62ef9e
wip
petemoore Oct 8, 2018
a252755
Started updating README.md
petemoore Oct 8, 2018
fb1ce0a
Updated docs
petemoore Oct 8, 2018
c94d9f2
wip
petemoore Oct 8, 2018
af99981
wip
petemoore Oct 8, 2018
59596b8
wip
petemoore Oct 8, 2018
b8a753d
fix
petemoore Oct 8, 2018
3a80e28
wip
petemoore Oct 8, 2018
e4606eb
wip
petemoore Oct 8, 2018
aadf963
wip
petemoore Oct 9, 2018
d5663ae
wip
petemoore Oct 9, 2018
df196dc
wip
petemoore Oct 9, 2018
6ab1fdf
wip
petemoore Oct 9, 2018
5e2220a
wip
petemoore Oct 10, 2018
216bd99
wip
petemoore Oct 10, 2018
2a61fef
wip
petemoore Oct 10, 2018
de1ce08
wip
petemoore Oct 10, 2018
df95808
wip
petemoore Oct 10, 2018
6f3cd76
wip
petemoore Oct 10, 2018
e9d8455
wip
petemoore Oct 10, 2018
7f8e8c3
wip
petemoore Oct 11, 2018
dca5175
wip
petemoore Oct 11, 2018
05b161a
Added download-secrets
petemoore Apr 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ _testmain.go

# For any releases made locally
/target/
worker_type_definitions
aws-provisioner-v1-worker-type-definitions

# Files created by generic-worker
generic-worker.config
Expand Down
72 changes: 36 additions & 36 deletions .taskcluster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ tasks:
- 'git clean -fdx'
- 'git checkout -B tmp -t "X%TASK_ID%"'
- go get -v -u github.com/taskcluster/livelog github.com/taskcluster/taskcluster-proxy github.com/gordonklaus/ineffassign
- cd gw-codegen
- cd cmd\gw-codegen
- go get -v -u
- cd ..
- go generate
- cd ..\..
- go generate ./...
- |
:: this counts the number of lines returned by git status
:: dump temp file a directory higher, otherwise git status reports the tmp1.txt file!
Expand All @@ -105,9 +105,9 @@ tasks:
- set CGO_ENABLED=1
- set GORACE=history_size=7
- C:\generic-worker\generic-worker-test-creds.cmd
- 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker.revision=%revision%" -v -race ./...'
- 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker/cmd/generic-worker.revision=%revision%" -v -race ./...'
- set GW_TESTS_RUN_AS_TASK_USER=true
- 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker.revision=%revision%" -v -race'
- 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker/cmd/generic-worker.revision=%revision%" -v -race github.com/taskcluster/generic-worker/cmd/generic-worker'
- ineffassign .
artifacts:
- name: public/build/generic-worker-windows-amd64.exe
Expand Down Expand Up @@ -168,17 +168,17 @@ tasks:
- 'git clean -fdx'
- 'git checkout -B tmp -t "X%TASK_ID%"'
- go get -v -u github.com/taskcluster/livelog github.com/taskcluster/taskcluster-proxy github.com/gordonklaus/ineffassign
- cd gw-codegen
- cd cmd\gw-codegen
- go get -v -u
- cd ..
- go generate
- cd ..\..
- go generate ./...
- set revision={{ event.head.sha }}
- go get -ldflags "-X main.revision=%revision%" -v -u -t ./...
- set GORACE=history_size=7
- C:\generic-worker\generic-worker-test-creds.cmd
- 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker.revision=%revision%" -v ./...'
- 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker/cmd/generic-worker.revision=%revision%" -v ./...'
- set GW_TESTS_RUN_AS_TASK_USER=true
- 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker.revision=%revision%" -v'
- 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker/cmd/generic-worker.revision=%revision%" -v github.com/taskcluster/generic-worker/cmd/generic-worker'
- ineffassign .
artifacts:
- name: public/build/generic-worker-windows-386.exe
Expand Down Expand Up @@ -239,10 +239,10 @@ tasks:
- 'git clean -fdx'
- 'git checkout -B tmp -t "X%TASK_ID%"'
- go get -v -u github.com/taskcluster/livelog github.com/taskcluster/taskcluster-proxy github.com/gordonklaus/ineffassign
- cd gw-codegen
- cd cmd\gw-codegen
- go get -v -u
- cd ..
- go generate
- cd ..\..
- go generate ./...
- |
:: this counts the number of lines returned by git status
:: dump temp file a directory higher, otherwise git status reports the tmp1.txt file!
Expand All @@ -258,9 +258,9 @@ tasks:
- set CGO_ENABLED=1
- set GORACE=history_size=7
- C:\generic-worker\generic-worker-test-creds.cmd
- 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker.revision=%revision%" -v -race ./...'
- 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker/cmd/generic-worker.revision=%revision%" -v -race ./...'
- set GW_TESTS_RUN_AS_TASK_USER=true
- 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker.revision=%revision%" -v -race'
- 'go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker/cmd/generic-worker.revision=%revision%" -v -race github.com/taskcluster/generic-worker/cmd/generic-worker'
- ineffassign .
artifacts:
- name: public/build/generic-worker-windows-amd64.exe
Expand Down Expand Up @@ -310,12 +310,12 @@ tasks:
export CGO_ENABLED=0
export GOROOT="$(pwd)/go1.10.3/go"
export GOPATH="$(pwd)/gopath1.10.3"
export PATH="${GOPATH}/bin:${GOROOT}/bin:${PATH}"
export PATH="$(go env GOPATH)/bin:${GOROOT}/bin:${PATH}"
go version
go env
source "${GW_CREDS_BOOTSTRAP}"
mkdir -p "${GOPATH}/src/github.com/taskcluster"
cd "${GOPATH}/src/github.com/taskcluster"
mkdir -p "$(go env GOPATH)/src/github.com/taskcluster"
cd "$(go env GOPATH)/src/github.com/taskcluster"
if [ ! -d generic-worker/.git ]; then rm -rf generic-worker; git clone '{{ event.head.repo.url }}' 'generic-worker'; fi
cd 'generic-worker'
git fetch '{{ event.head.repo.url }}' "+{{ event.head.ref }}:refs/heads/X${TASK_ID}"
Expand All @@ -324,14 +324,14 @@ tasks:
git clean -fdx
git checkout -B tmp -t "X${TASK_ID}"
go get -v -u github.com/taskcluster/livelog github.com/taskcluster/taskcluster-proxy github.com/gordonklaus/ineffassign
cd gw-codegen
cd cmd/gw-codegen
go get -v -u
cd ..
go generate
cd ../..
go generate ./...
go get -ldflags "-X main.revision=$(git rev-parse HEAD)" -v -u -t ./...
# output of wc command can contain spaces on darwin, so no quotes around expression
test $(git status --porcelain | wc -l) == 0
GORACE=history_size=7 CGO_ENABLED=1 go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker.revision=$(git rev-parse HEAD)" -race -v ./...
GORACE=history_size=7 CGO_ENABLED=1 go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker/cmd/generic-worker.revision=$(git rev-parse HEAD)" -race -v ./...
ineffassign .
artifacts:
- name: public/build/generic-worker-darwin-amd64
Expand Down Expand Up @@ -382,13 +382,13 @@ tasks:
# export CGO_ENABLED=0
# export GOROOT="$(pwd)/go1.10.3/go"
# export GOPATH="$(pwd)/gopath1.10.3"
# export PATH="${GOPATH}/bin:${GOROOT}/bin:${PATH}"
# export PATH="$(go env GOPATH)/bin:${GOROOT}/bin:${PATH}"
# export CGO_ENABLED=0
# go version
# go env
# source "${GW_CREDS_BOOTSTRAP}"
# mkdir -p "${GOPATH}/src/github.com/taskcluster"
# cd "${GOPATH}/src/github.com/taskcluster"
# mkdir -p "$(go env GOPATH)/src/github.com/taskcluster"
# cd "$(go env GOPATH)/src/github.com/taskcluster"
# if [ ! -d generic-worker/.git ]; then rm -rf generic-worker; git clone '{{ event.head.repo.url }}' 'generic-worker'; fi
# cd 'generic-worker'
# git fetch '{{ event.head.repo.url }}' "+{{ event.head.ref }}:refs/heads/X${TASK_ID}"
Expand All @@ -397,13 +397,13 @@ tasks:
# git clean -fdx
# git checkout -B tmp -t "X${TASK_ID}"
# go get -v -u github.com/taskcluster/livelog github.com/taskcluster/taskcluster-proxy github.com/gordonklaus/ineffassign
# cd gw-codegen
# cd cmd/gw-codegen
# go get -v -u
# cd ..
# go generate
# cd ../..
# go generate ./...
# go get -ldflags "-X main.revision=$(git rev-parse HEAD)" -v -u -t ./...
# test "$(git status --porcelain | wc -l)" == 0
# GORACE=history_size=7 go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker.revision=$(git rev-parse HEAD)" -v ./...
# GORACE=history_size=7 go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker/cmd/generic-worker.revision=$(git rev-parse HEAD)" -v ./...
# ineffassign .
# artifacts:
# - name: public/build/generic-worker-linux-armv6l
Expand Down Expand Up @@ -454,8 +454,8 @@ tasks:
go env
curl -s http://taskcluster/secrets/v1/secret/repo:github.com/taskcluster/generic-worker | sed -n 's/.*"b64_encoded_credentials_script": "\(.*\)".*/\1/p' | base64 -d > ~/env_private.sh
source ~/env_private.sh
mkdir -p "${GOPATH}/src/github.com/taskcluster"
cd "${GOPATH}/src/github.com/taskcluster"
mkdir -p "$(go env GOPATH)/src/github.com/taskcluster"
cd "$(go env GOPATH)/src/github.com/taskcluster"
if [ ! -d generic-worker/.git ]; then rm -rf generic-worker; git clone '{{ event.head.repo.url }}' 'generic-worker'; fi
cd 'generic-worker'
git fetch '{{ event.head.repo.url }}' "+{{ event.head.ref }}:refs/heads/X${TASK_ID}"
Expand All @@ -464,14 +464,14 @@ tasks:
git clean -fdx
git checkout -B tmp -t "X${TASK_ID}"
go get -v -u github.com/taskcluster/livelog github.com/taskcluster/taskcluster-proxy github.com/gordonklaus/ineffassign
cd gw-codegen
cd cmd/gw-codegen
go get -v -u
cd ..
go generate
cd ../..
go generate ./...
go get -ldflags "-X main.revision=$(git rev-parse HEAD)" -v -u -t ./...
test "$(git status --porcelain | wc -l)" == 0
GORACE=history_size=7 CGO_ENABLED=1 go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker.revision=$(git rev-parse HEAD)" -v -race ./...
"${GOPATH}/bin/ineffassign" .
GORACE=history_size=7 CGO_ENABLED=1 go test -timeout 30m -ldflags "-X github.com/taskcluster/generic-worker/cmd/generic-worker.revision=$(git rev-parse HEAD)" -v -race ./...
"$(go env GOPATH)/bin/ineffassign" .
artifacts:
public/build/generic-worker-linux-amd64:
path: "/go/bin/generic-worker"
Expand Down
12 changes: 6 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ env:
- "CGO_ENABLED=0 GIMME_OS=linux GIMME_ARCH=386"
- "CGO_ENABLED=0 GIMME_OS=linux GIMME_ARCH=amd64"
- "CGO_ENABLED=0 GIMME_OS=linux GIMME_ARCH=arm"
# currently broken
# currently broken due to upstream issue
# - "CGO_ENABLED=0 GIMME_OS=linux GIMME_ARCH=arm64"
- "CGO_ENABLED=0 GIMME_OS=darwin GIMME_ARCH=amd64"
- "CGO_ENABLED=0 GIMME_OS=windows GIMME_ARCH=amd64"
Expand All @@ -16,16 +16,16 @@ install:
- "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || go get github.com/mattn/goveralls github.com/taskcluster/taskcluster-proxy github.com/taskcluster/livelog github.com/gordonklaus/ineffassign"

script:
- "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || go get ./gw-codegen"
- "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || go generate"
- "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || go get ./cmd/gw-codegen"
- "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || go generate ./..."
- "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || git status"
- "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || test $(git status --porcelain | wc -l) == 0"
- "go get -ldflags \"-X main.revision=$(git rev-parse HEAD)\" -v -t ./..."
- "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || GORACE=history_size=7 travis_wait 30 ./gotestcover.sh coverage.report"
- "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || ${GOPATH}/bin/ineffassign ."
- "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || GORACE=history_size=7 travis_wait 30 scripts/gotestcover.sh coverage.report"
- "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || $(go env GOPATH)/bin/ineffassign ."

after_script:
- "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || ${GOPATH}/bin/goveralls -coverprofile=coverage.report -service=travis-ci"
- "test $GIMME_OS.$GIMME_ARCH != linux.amd64 || $(go env GOPATH)/bin/goveralls -coverprofile=coverage.report -service=travis-ci"

before_deploy:
- "source .travis_rename_releases.sh"
Expand Down
Loading