summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2020-09-01 11:16:50 +1000
committermo khan <mo.khan@gmail.com>2020-09-07 13:39:32 -0600
commit87ad60071950acd3643523f24d7b9929a4a8be82 (patch)
tree70392281708981660a6cb7d5eeae36e8b2e774f6
parent0b8ea460fa53d61e741db32de188ed35a3b27765 (diff)
Require Go 1.15.1 for project
-rw-r--r--.gitlab/deb.yml4
-rw-r--r--CHANGELOG.md4
-rw-r--r--Gemfile.lock2
-rw-r--r--config/files/.tool-versions2
-rw-r--r--lib/license/management/version.rb2
5 files changed, 9 insertions, 5 deletions
diff --git a/.gitlab/deb.yml b/.gitlab/deb.yml
index a0b5f29..2a9a3a7 100644
--- a/.gitlab/deb.yml
+++ b/.gitlab/deb.yml
@@ -28,11 +28,11 @@ license_management:
variables:
OMNIBUS_PROJECT: license_management
-golang-1.14.6:
+golang-1.15.1:
extends: .deb
variables:
OMNIBUS_PROJECT: golang
- GOLANG_VERSION: '1.14.6'
+ GOLANG_VERSION: '1.15.1'
java-8:
extends: .deb
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b798258..c42ca7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
# GitLab License management changelog
+## v3.25.1
+
+- Set `golang` version to `1.15.1` in `.tool-versions` file. (!212)
+
## v3.25.0
- Install tools from Debian package. (!188)
diff --git a/Gemfile.lock b/Gemfile.lock
index 8a88ca9..2f1b7d3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
PATH
remote: .
specs:
- license-management (3.25.0)
+ license-management (3.25.1)
license_finder (~> 6.7)
GEM
diff --git a/config/files/.tool-versions b/config/files/.tool-versions
index 6fa1c96..515e14a 100644
--- a/config/files/.tool-versions
+++ b/config/files/.tool-versions
@@ -1,6 +1,6 @@
dotnet-core 3.1.302
elixir 1.10.4
-golang 1.14.6
+golang 1.15.1
java 8
mono 6.8.0.123
nodejs 12.18.2
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index a9eefb3..ec7cb80 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
module License
module Management
- VERSION = '3.25.0'
+ VERSION = '3.25.1'
end
end