From d9dd3c86010152c2db8cce73ef5dfe053f9df3a5 Mon Sep 17 00:00:00 2001
From: Timotej Ecimovic <timotej.ecimovic@silabs.com>
Date: Sat, 13 Jun 2020 12:06:46 -0400
Subject: [PATCH] Whitelist another license, add a version printout on CI.
---
Jenkinsfile | 2 ++
license-whitelist.txt | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 9b2ac1ff..ce6c0c56 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,6 +24,8 @@ pipeline
{
sh 'npm install'
sh 'npm list || true'
+ sh 'npm --version'
+ sh 'node --version'
}
}
}
diff --git a/license-whitelist.txt b/license-whitelist.txt
index 026877dc..ba49f2a5 100644
--- a/license-whitelist.txt
+++ b/license-whitelist.txt
@@ -13,4 +13,5 @@ MIT*
(WTFPL OR MIT)
WTFPL OR ISC
WTFPL
-(MIT OR CC0-1.0)
\ No newline at end of file
+(MIT OR CC0-1.0)
+(MIT OR Apache-2.0)
--
GitLab