From 1192e83dfdf69b78cc25906baedb5a9f18f11985 Mon Sep 17 00:00:00 2001
From: Michal Nowikowski <godfryd@isc.org>
Date: Fri, 6 Dec 2019 12:07:20 +0100
Subject: [PATCH 1/2] [#102] updated tools to more less latest versions

---
 Rakefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Rakefile b/Rakefile
index f463d39be..8fc57fff5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,12 +2,12 @@
 require 'rake'
 
 # Tool Versions
-NODE_VER = '10.16.3'
-SWAGGER_CODEGEN_VER = '2.4.8'
-GOSWAGGER_VER = 'v0.20.1'
+NODE_VER = '12.13.1'
+SWAGGER_CODEGEN_VER = '2.4.10'
+GOSWAGGER_VER = 'v0.21.0'
 GOLANGCILINT_VER = '1.21.0'
-GO_VER = '1.13.1'
-PROTOC_VER = '3.10.0'
+GO_VER = '1.13.5'
+PROTOC_VER = '3.11.1'
 
 # Check host OS
 UNAME=`uname -s`
-- 
GitLab


From 8f24485bd7e75de44ba4b3674b164d320607221c Mon Sep 17 00:00:00 2001
From: Michal Nowikowski <godfryd@isc.org>
Date: Mon, 23 Dec 2019 12:52:19 +0100
Subject: [PATCH 2/2] [#102] fixed handling dependencies for tools in Rakefile

---
 Rakefile | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/Rakefile b/Rakefile
index 8fc57fff5..066d47eeb 100644
--- a/Rakefile
+++ b/Rakefile
@@ -61,13 +61,16 @@ RICHGO_URL = 'github.com/kyoh86/richgo'
 TOOLS_DIR = File.expand_path('tools')
 NPX = "#{TOOLS_DIR}/node-v#{NODE_VER}-#{NODE_SUFFIX}/bin/npx"
 SWAGGER_CODEGEN = "#{TOOLS_DIR}/swagger-codegen-cli-#{SWAGGER_CODEGEN_VER}.jar"
-GOSWAGGER = "#{TOOLS_DIR}/#{GOSWAGGER_BIN}"
+GOSWAGGER_DIR = "#{TOOLS_DIR}/#{GOSWAGGER_VER}"
+GOSWAGGER = "#{GOSWAGGER_DIR}/#{GOSWAGGER_BIN}"
 NG = File.expand_path('webui/node_modules/.bin/ng')
 GOHOME_DIR = File.expand_path('~/go')
 GOBIN = "#{GOHOME_DIR}/bin"
-GO = "#{TOOLS_DIR}/go/bin/go"
+GO_DIR = "#{TOOLS_DIR}/#{GO_VER}"
+GO = "#{GO_DIR}/go/bin/go"
 GOLANGCILINT = "#{TOOLS_DIR}/golangci-lint-#{GOLANGCILINT_VER}-#{GOLANGCILINT_SUFFIX}/golangci-lint"
-PROTOC = "#{TOOLS_DIR}/protoc/bin/protoc"
+PROTOC_DIR = "#{TOOLS_DIR}/#{PROTOC_VER}"
+PROTOC = "#{PROTOC_DIR}/bin/protoc"
 PROTOC_GEN_GO = "#{GOBIN}/protoc-gen-go"
 MOCKERY = "#{GOBIN}/mockery"
 MOCKGEN = "#{GOBIN}/mockgen"
@@ -97,8 +100,9 @@ directory TOOLS_DIR
 
 # Server Rules
 file GO => [TOOLS_DIR, GOHOME_DIR] do
-  Dir.chdir(TOOLS_DIR) do
-    sh "wget #{GO_URL} -O go.tar.gz"
+  sh "mkdir -p #{GO_DIR}"
+  sh "wget #{GO_URL} -O #{GO_DIR}/go.tar.gz"
+  Dir.chdir(GO_DIR) do
     sh 'tar -zxf go.tar.gz'
   end
 end
@@ -113,6 +117,7 @@ desc 'Generate server part of REST API using goswagger based on swagger.yml'
 task :gen_server => [GO, GOSWAGGER, SERVER_GEN_FILES]
 
 file GOSWAGGER => TOOLS_DIR do
+  sh "mkdir -p #{GOSWAGGER_DIR}"
   sh "wget #{GOSWAGGER_URL} -O #{GOSWAGGER}"
   sh "chmod a+x #{GOSWAGGER}"
 end
@@ -124,9 +129,9 @@ task :build_server => [GO, :gen_server, :gen_agent] do
 end
 
 file PROTOC do
-  sh "mkdir -p #{TOOLS_DIR}/protoc"
-  Dir.chdir("#{TOOLS_DIR}/protoc") do
-    sh "wget #{PROTOC_URL} -O protoc.zip"
+  sh "mkdir -p #{PROTOC_DIR}"
+  sh "wget #{PROTOC_URL} -O #{PROTOC_DIR}/protoc.zip"
+  Dir.chdir(PROTOC_DIR) do
     sh 'unzip protoc.zip'
   end
 end
-- 
GitLab