Commit 072ad5e7 authored by mo's avatar mo

Merge branch 'eread/set-golang-1_15_2' into 'main'

Set Go 1.15.2 and Ruby to 2.7.2 for project

See merge request !6
parents 11656427 9c02ffe7
Pipeline #205537763 failed with stages
in 100 minutes and 1 second
......@@ -34,11 +34,11 @@ license_management:
variables:
OMNIBUS_PROJECT: license_management
golang-1.15.1:
golang-1.15.2:
extends: .deb
variables:
OMNIBUS_PROJECT: golang
GOLANG_VERSION: '1.15.1'
GOLANG_VERSION: '1.15.2'
java-8:
extends: .deb
......
# GitLab License management changelog
## v3.28.1
- Set `golang` version to `1.15.2` in `.tool-versions` file. (https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/-/merge_requests/6)
- Set `ruby` version to `2.7.2` in `.tool-versions` file and other places. (https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/-/merge_requests/6)
## v3.28.0
- Move project from https://gitlab.com/gitlab-org/security-products/license-management to https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/ https://gitlab.com/gitlab-org/security-products/analyzers/license-finder/-/merge_requests/3
......
......@@ -8,7 +8,7 @@ GIT
PATH
remote: .
specs:
license-management (3.28.0)
license-management (3.28.1)
license_finder (~> 6.7)
spandx (~> 0.13)
......
dotnet-core 3.1.302
elixir 1.10.4
golang 1.15.1
golang 1.15.2
java 8
mono 6.8.0.123
nodejs 12.18.2
php 7.4.8
python 3.8.5
ruby 2.6.6
ruby 2.7.2
rust 1.45.0
sbt 1.3.8
# frozen_string_literal: true
golang_version = ENV.fetch('GOLANG_VERSION', '1.15.1')
golang_version = ENV.fetch('GOLANG_VERSION', '1.15.2')
name "golang-#{golang_version}"
maintainer "GitLab B.V."
......
# frozen_string_literal: true
name "asdf_golang"
default_version "1.15.1"
default_version "1.15.2"
source url: "https://golang.org/dl/go#{version}.linux-amd64.tar.gz"
relative_path "go"
......@@ -18,6 +18,9 @@ end
version "1.15.1" do
source sha256: "70ac0dbf60a8ee9236f337ed0daa7a4c3b98f6186d4497826f68e97c0c0413f6"
end
version "1.15.2" do
source sha256: "b49fda1ca29a1946d6bb2a5a6982cf07ccd2aba849289508ee0f9918f6bb4552"
end
build do
mkdir install_dir
......
......@@ -7,14 +7,14 @@ license_file "BSDL"
license_file "COPYING"
license_file "LEGAL"
default_version "2.7.1"
default_version "2.7.2"
dependency "libffi"
dependency "libyaml"
dependency "openssl"
dependency "zlib"
source url: "https://cache.ruby-lang.org/pub/ruby/#{version.match(/^(\d+\.\d+)/)[0]}/ruby-#{version}.tar.gz", sha256: "d418483bdd0000576c1370571121a6eb24582116db0b7bb2005e90e250eae418"
source url: "https://cache.ruby-lang.org/pub/ruby/#{version.match(/^(\d+\.\d+)/)[0]}/ruby-#{version}.tar.gz", sha256: "6e5706d0d4ee4e1e2f883db9d768586b4d06567debea353c796ec45e8321c3d4"
relative_path "ruby-#{version}"
embedded_dir = "#{install_dir}/embedded"
......
......@@ -2,6 +2,6 @@
module License
module Management
VERSION = '3.28.0'
VERSION = '3.28.1'
end
end
......@@ -72,7 +72,7 @@ RSpec.describe LicenseFinder::Bundler do
context "when a ruby is not specified it uses the default version" do
let(:project_fixture) { fixture_file('ruby/bundler-v2.1') }
specify { expect(subject).to eql('2.6.6') }
specify { expect(subject).to eql('2.7.2') }
end
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment