Skip to content
Snippets Groups Projects
Commit c25f5a6e authored by Benguria Elguezabal, Gorka's avatar Benguria Elguezabal, Gorka
Browse files

Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	CHANGELOG.md
parents 13906bac 1507da2d
Branches
No related tags found
No related merge requests found
Pipeline #170018 passed
...@@ -14,7 +14,7 @@ Add the following to your `.gitlab-ci.yml`: ...@@ -14,7 +14,7 @@ Add the following to your `.gitlab-ci.yml`:
```yaml ```yaml
include: include:
# 1: include the component # 1: include the component
- component: $CI_SERVER_FQDN/to-be-continuous/golang/gitlab-ci-golang@4.11.1 - component: $CI_SERVER_FQDN/to-be-continuous/golang/gitlab-ci-golang@4.12.0
# 2: set/override component inputs # 2: set/override component inputs
inputs: inputs:
image: "registry.hub.docker.com/library/golang:buster" # ⚠ this is only an example image: "registry.hub.docker.com/library/golang:buster" # ⚠ this is only an example
...@@ -28,7 +28,7 @@ Add the following to your `.gitlab-ci.yml`: ...@@ -28,7 +28,7 @@ Add the following to your `.gitlab-ci.yml`:
include: include:
# 1: include the template # 1: include the template
- project: 'to-be-continuous/golang' - project: 'to-be-continuous/golang'
ref: '4.11.1' ref: '4.12.0'
file: '/templates/gitlab-ci-golang.yml' file: '/templates/gitlab-ci-golang.yml'
variables: variables:
......
...@@ -198,9 +198,6 @@ workflow: ...@@ -198,9 +198,6 @@ workflow:
- when: on_success - when: on_success
variables: variables:
# variabilized tracking image
TBC_TRACKING_IMAGE: registry.gitlab.com/to-be-continuous/tools/tracking:master
# Default Go project root directory # Default Go project root directory
GO_PROJECT_DIR: $[[ inputs.project-dir ]] GO_PROJECT_DIR: $[[ inputs.project-dir ]]
...@@ -628,7 +625,7 @@ stages: ...@@ -628,7 +625,7 @@ stages:
image: $GO_IMAGE image: $GO_IMAGE
services: services:
- name: "$TBC_TRACKING_IMAGE" - name: "$TBC_TRACKING_IMAGE"
command: ["--service", "golang", "4.11.1"] command: ["--service", "golang", "4.12.0"]
variables: variables:
# The directory where 'go install' will install a command. # The directory where 'go install' will install a command.
GOBIN: "$CI_PROJECT_DIR/$GO_PROJECT_DIR/bin" GOBIN: "$CI_PROJECT_DIR/$GO_PROJECT_DIR/bin"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment