Mirrors/VILLASweb-backend-go
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web-backend-go/ synced 2025-03-30 00:00:12 +01:00
Code Issues Releases Wiki Activity

- use Go 1.13 in docker image

Browse source 
- revert version changes of swag (use latest)
This commit is contained in:
Sonja Happ 2019-09-10 13:30:34 +02:00
parent 2c3fd9ba88
commit 52e2056ca9
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -40,7 +40,7 @@ build:backend:
image: villaswebbackendgo:ubuntu image: villaswebbackendgo:ubuntu
script: script:
- go mod tidy - go mod tidy
- go get -u github.com/swaggo/swag/cmd/swag@v1.6.0 - go get -u github.com/swaggo/swag/cmd/swag
- ~/go/bin/swag init -p pascalcase -g "start.go" -o "./doc/api/" - ~/go/bin/swag init -p pascalcase -g "start.go" -o "./doc/api/"
- go build - go build
artifacts: artifacts:
@ -73,7 +73,7 @@ test:database:
script: script:
- /etc/init.d/postgresql start - /etc/init.d/postgresql start
- go mod tidy - go mod tidy
- go get -u github.com/swaggo/swag/cmd/swag@v1.6.0 - go get -u github.com/swaggo/swag/cmd/swag
- ~/go/bin/swag init -p pascalcase -g "start.go" -o "./doc/api/" - ~/go/bin/swag init -p pascalcase -g "start.go" -o "./doc/api/"
- cd common - cd common
- go test -v -args -dbhost=/var/run/postgresql - go test -v -args -dbhost=/var/run/postgresql
@ -88,7 +88,7 @@ test:scenario:
script: script:
- /etc/init.d/postgresql start - /etc/init.d/postgresql start
- go mod tidy - go mod tidy
- go get -u github.com/swaggo/swag/cmd/swag@v1.6.0 - go get -u github.com/swaggo/swag/cmd/swag
- ~/go/bin/swag init -p pascalcase -g "start.go" -o "./doc/api/" - ~/go/bin/swag init -p pascalcase -g "start.go" -o "./doc/api/"
- cd ${TEST_FOLDER} - cd ${TEST_FOLDER}
- go test -v -args -dbhost=/var/run/postgresql - go test -v -args -dbhost=/var/run/postgresql
@ -138,7 +138,7 @@ test:all:
script: script:
- /etc/init.d/postgresql start - /etc/init.d/postgresql start
- go mod tidy - go mod tidy
- go get -u github.com/swaggo/swag/cmd/swag@v1.6.0 - go get -u github.com/swaggo/swag/cmd/swag
- ~/go/bin/swag init -p pascalcase -g "start.go" -o "./doc/api/" - ~/go/bin/swag init -p pascalcase -g "start.go" -o "./doc/api/"
- go test $(go list ./... ) -v -p 1 -covermode=count -coverprofile ./testcover.txt - go test $(go list ./... ) -v -p 1 -covermode=count -coverprofile ./testcover.txt
- go tool cover -func=testcover.txt - go tool cover -func=testcover.txt

6
Dockerfile.ubuntu
View file

@ -11,10 +11,10 @@ RUN apt-get update && apt-get upgrade -y
# Install dependencies # Install dependencies
RUN apt-get install -y git ca-certificates g++ gcc libc6 libc6-dev pkg-config wget tar lsb-release RUN apt-get install -y git ca-certificates g++ gcc libc6 libc6-dev pkg-config wget tar lsb-release
# Install Go 1.11 # Install Go 1.13
RUN cd /tmp && mkdir golang && cd golang && \ RUN cd /tmp && mkdir golang && cd golang && \
wget https://dl.google.com/go/go1.11.9.linux-amd64.tar.gz && \ wget https://dl.google.com/go/go1.13.linux-amd64.tar.gz && \
tar -xvf go1.11.9.linux-amd64.tar.gz && \ tar -xvf go1.13.linux-amd64.tar.gz && \
mv go /usr/local && \ mv go /usr/local && \
rm -rf /tmp/* rm -rf /tmp/*