Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpcs
dfss
Commits
415f8766
Commit
415f8766
authored
Apr 08, 2016
by
Loïck Bonniot
Browse files
Merge branch '203_goqt_ci' into 'master'
[CI] Update integration tests and deploy for GUIs See merge request
!48
parents
ae7eeac3
28e9713a
Pipeline
#514
passed with stages
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
415f8766
...
...
@@ -47,12 +47,23 @@ Integration tests:
tags
:
-
golang
-
mongo
-
goqt
services
:
-
"
lesterpig/mongo:latest"
script
:
-
"
ln
-s
-f
$(pwd)
$GOPATH/src/dfss"
-
"
./build/deps.sh"
-
"
cd
$GOPATH/src/dfss
&&
make
install"
# Copy required files
-
"
cp
$GOPATH/src/github.com/visualfc/goqt/bin/*
$GOPATH/src/dfss/dfssd/"
# Build ressources
-
"
cd
$GOPATH/src/dfss/dfssd/gui
&&
../goqt_rcc
-go
gui
-o
application.qrc.go
application.qrc"
# Build binary
-
"
cd
$GOPATH/src/dfss/dfssd
&&
go
build
-ldflags
\"
-r
.
\"
-o
dfssd"
# Install binary
-
"
mv
$GOPATH/src/dfss/dfssd/dfssd
/bin/"
-
"
mv
$GOPATH/src/dfss/dfssd/libqtdrv.ui.so.1
/lib/"
# Start integration tests
-
"
go
test
-v
dfss/tests"
Code lint
:
...
...
@@ -74,11 +85,12 @@ Code lint:
Deploy
:
stage
:
deploy
only
:
-
/^v[0-9]/
-
master
-
/^v[0-9]/
-
master
tags
:
-
golang
-
strong
-
goqt
script
:
-
"
ln
-s
-f
$(pwd)
$GOPATH/src/dfss"
-
"
./build/deps.sh"
...
...
Makefile
View file @
415f8766
...
...
@@ -20,7 +20,6 @@ install_all: install
go
install
./...
git reset
--hard
release
:
clean build_all package
# prepare_gui builds a new container from the goqt image, adding DFSS dependencies for faster builds.
# call it once or after dependency addition.
...
...
@@ -52,9 +51,21 @@ protobuf:
protoc
--go_out
=
plugins
=
grpc:. dfss/dfsst/api/resolution.proto
# Release internals
build_all
:
# Do not run these commands on your personal computer
release
:
clean build_x build_g package
build_x
:
go get github.com/mitchellh/gox
gox
-os
"linux darwin windows"
-parallel
1
-output
"release/dfss_
${VERSION}
_{{.OS}}_{{.Arch}}/{{.Dir}}"
dfss/dfssc dfss/dfssp dfss/dfsst
gox
-osarch
"linux/amd64 linux/386 linux/arm windows/386 darwin/amd64"
-parallel
1
-output
"release/dfss_
${VERSION}
_{{.OS}}_{{.Arch}}/{{.Dir}}"
dfss/dfssc dfss/dfssp dfss/dfsst
build_g
:
cp
$(GOPATH)
/src/github.com/visualfc/goqt/bin/goqt_rcc /bin/
cp
$(GOPATH)
/src/github.com/visualfc/goqt/bin/lib
*
/lib/
cd
gui
&&
goqt_rcc
-go
main
-o
a.qrc.go application.qrc
cd
dfssd/gui
&&
goqt_rcc
-go
gui
-o
a.qrc.go application.qrc
cd
gui
&&
go build
-ldflags
"-r ."
-o
../release/dfss_
${VERSION}
_linux_amd64/dfssc_gui
cd
dfssd/gui
&&
go build
-ldflags
"-r ."
-o
../../release/dfss_
${VERSION}
_linux_amd64/dfssd
cp
/lib/libqtdrv.ui.so.1.0.0 release/dfss_
${VERSION}
_linux_amd64/libqtdrv.ui.so.1
package
:
echo
"
$(VERSION)
$(REVISION)
"
>
build/embed/VERSION
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment