Skip to content
This repository has been archived by the owner on Feb 24, 2024. It is now read-only.

Fix generated GitLab ci YAML #2086

Merged
merged 3 commits into from
Mar 11, 2021
Merged

Fix generated GitLab ci YAML #2086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fafc35
gitlab-ci: Default to Golang 1.15
ZJvandeWeg Feb 24, 2021
a91a37f
gitlab-ci: Leverage gomodules over GOPATH
ZJvandeWeg Feb 24, 2021
220c67b
gitlab-ci: Update postgres connection details
ZJvandeWeg Feb 24, 2021
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
9 changes: 3 additions & 6 deletions genny/ci/templates/-dot-gitlab-ci-no-pop.yml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
before_script:
- ln -s /builds /go/src/$(echo "{{.opts.App.PackagePkg}}" | cut -d "/" -f1)
- cd /go/src/{{.opts.App.PackagePkg}}
- mkdir -p public/assets
- go get -u github.com/gobuffalo/buffalo/buffalo
- go mod download
- export PATH="$PATH:$GOPATH/bin"

stages:
- test
Expand All @@ -17,12 +14,12 @@ stages:
.use-golang-image: &use-golang-latest
image: golang:latest

.use-golang-image: &use-golang-1-8
image: golang:1.8
.use-golang-image: &use-golang-1-15
image: golang:1.15

test:
# Change to "<<: *use-golang-latest" to use the latest Go version
<<: *use-golang-1-8
<<: *use-golang-1-15
<<: *test-vars
stage: test
script:
Expand Down
15 changes: 8 additions & 7 deletions genny/ci/templates/-dot-gitlab-ci.yml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@ before_script:
{{- else if eq .opts.DBType "mysql" }}
- apt-get update && apt-get install -y mysql-client
{{- end }}
- ln -s /builds /go/src/$(echo "{{.opts.App.PackagePkg}}" | cut -d "/" -f1)
- cd /go/src/{{.opts.App.PackagePkg}}
- mkdir -p public/assets
- go get -u github.com/gobuffalo/buffalo/buffalo
- go mod download
- export PATH="$PATH:$GOPATH/bin"

stages:
- test
Expand All @@ -19,22 +16,26 @@ stages:
GO_ENV: "test"
{{- if eq .opts.DBType "postgres" }}
POSTGRES_DB: "{{.opts.App.Name.File}}_test"
POSTGRES_USER: runner
POSTGRES_PASSSWORD: ""
POSTGRES_HOST_AUTH_METHOD: trust
TEST_DATABASE_URL: "postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}?sslmode=disable"
{{- else if eq .opts.DBType "mysql" }}
MYSQL_DATABASE: "{{.opts.App.Name.File}}_test"
MYSQL_ROOT_PASSWORD: "root"
{{- end }}
TEST_DATABASE_URL: "{{.testDbUrl}}"
{{- end }}

# Golang version choice helper
.use-golang-image: &use-golang-latest
image: golang:latest

.use-golang-image: &use-golang-1-8
image: golang:1.8
.use-golang-image: &use-golang-1-15
image: golang:1.15

test:
# Change to "<<: *use-golang-latest" to use the latest Go version
<<: *use-golang-1-8
<<: *use-golang-1-15
<<: *test-vars
stage: test
services:
Expand Down