Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restructure go backend (with source moves) #2854

Merged
merged 27 commits into from
Aug 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
54e71ee
Migration script (modified from @aeijdenberg)
nwmac Aug 14, 2018
461cc56
Remove empty app-core folder
nwmac Aug 14, 2018
af6c833
Fixes
nwmac Aug 15, 2018
6e12b7d
Non-source changes for go-backend re-work
nwmac Aug 15, 2018
d8354cd
Fixes to get cf push working
nwmac Aug 15, 2018
0f7dc0a
Remove glide. Commit dep files etc
nwmac Aug 16, 2018
55a2ada
Cache vendor folder
nwmac Aug 16, 2018
629e526
Tweaks for cf push and vendor cache
nwmac Aug 17, 2018
ce1f645
Use vendor folder if present
nwmac Aug 17, 2018
e03ab10
Merge v2-master
nwmac Aug 17, 2018
7f89593
Don't do an npm install if using pre-built UI
nwmac Aug 18, 2018
3ae37ac
Remove scripts no longer needed
nwmac Aug 19, 2018
05da3f0
backend re-structure with file moves
nwmac Aug 20, 2018
87234ec
Merge remote-tracking branch 'origin/v2-master' into backend-go-rework
nwmac Aug 20, 2018
dce65a7
Fix issue cloning from bitbucket with ssh
nwmac Aug 20, 2018
e889745
Fix bitbucket clone issue
nwmac Aug 20, 2018
70292fd
Merge remote-tracking branch 'origin/v2-master' into backend-go-rework
nwmac Aug 20, 2018
d5fdc49
Resolve conflicts [e2e] [e2e-full]
nwmac Aug 20, 2018
55d4f1c
Install dep and glide
nwmac Aug 20, 2018
92656c5
Use official glide script
nwmac Aug 20, 2018
04318cd
wget is needed for golang install
nwmac Aug 20, 2018
d1a2240
Need curl to be installed
nwmac Aug 20, 2018
b2f9440
Update to go 1.9
nwmac Aug 21, 2018
db6faf7
Fix All in one build
Aug 21, 2018
f8fea29
Update go version in bosh release
nwmac Aug 21, 2018
fff4017
Update from backend-rework branch
nwmac Aug 21, 2018
a73a6d3
Update go to 1.9.7
Aug 21, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 5 additions & 3 deletions .cfignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,21 @@
node_modules/
bower_components/
dist/
components/*/backend/vendor
dev-certs/
out/
outputs/
tmp/
tools/
CHANGELOG.md
*.md
test/
deploy/all-in-one/
deploy/ci/
deploy/containers/
deploy/docker-compose/
deploy/stratos-ui-release/
deploy/fissile/
deploy/kubernetes/
deploy/stratos-base-images/
deploy/stratos-ui-release/
deploy/uaa/
docs/
build/dev_config.json
8 changes: 2 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ dev-certs/*
vendor/
**/vendor
**/*.so
.glide
tools/ssl
build/secrets.json
deploy/data/
Expand All @@ -76,21 +75,18 @@ deploy/stratos-ui-release/.blobs
deploy/stratos-ui-release/dev_releases/
output/fissile
deploy/ci/travis/temp/
deploy/glide-cache/

.dist/
deploy/uaa/tmp/
src/backend/app-core/plugins
src/backend/app-core/debug
src/backend/*/vendor/
src/backend/app-core/load_plugins.go
.v8flags*

*.bak
secrets.yaml
build/dev_config.json
e2e-reports/
.stratos-git-metadata.json
src/jetstream/jetstream

# Customisations

Expand All @@ -107,4 +103,4 @@ src/frontend/index.html

# Prebuild package

stratos-frontend-prebuild.zip
stratos-frontend-prebuild.zip
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ before_install:
install:
- npm install npm@5.6.0 -g
- npm install
- ssh-keyscan -t rsa bitbucket.org >> ~/.ssh/known_hosts
filter_secrets: false
branches:
only:
Expand All @@ -36,9 +37,9 @@ stages:
- Frontend Unit Tests
- Backend
- name: E2E tests
if: type != pull_request
if: type != pull_request OR commit_message =~ /\[e2e\-full\]/
- name: E2E tests quick
if: type != pull_request OR head_branch =~ ^(?i:e2e)-.*$
if: type != pull_request OR head_branch =~ ^(?i:e2e)-.*$ OR commit_message =~ /\[e2e\]/
jobs:
include:
- stage: Frontend Lint
Expand All @@ -55,7 +56,7 @@ jobs:
- curl -sL -o ~/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
- chmod +x ~/bin/gimme
- eval "$(gimme 1.9)"
- curl https://glide.sh/get | sh
- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
script:
- npm run test-backend
- stage: E2E tests
Expand Down
Loading