From 6683313c8338234ae6a0bb8b23cdb7767567dbd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Thu, 2 Jul 2020 10:07:19 +0200 Subject: [PATCH] fix QTDIR paths for CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub SokoĊ‚owski --- ci/Jenkinsfile.linux | 2 ++ ci/Jenkinsfile.macos | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux index fd203e80c0..14fae74a13 100644 --- a/ci/Jenkinsfile.linux +++ b/ci/Jenkinsfile.linux @@ -26,6 +26,8 @@ pipeline { NIMFLAGS = '--colors:off' /* Verbosity of make targets */ V = "1" + /* Makefile assumes the compiler folder is included */ + QTDIR = "/opt/qt/5.14.0/gcc_64" /* Control output the filename */ STATUS_CLIENT_APPIMAGE = "pkg/${load('ci/lib.groovy').pkgFilename('linux', 'AppImage')}" } diff --git a/ci/Jenkinsfile.macos b/ci/Jenkinsfile.macos index a82b31170d..6caaece450 100644 --- a/ci/Jenkinsfile.macos +++ b/ci/Jenkinsfile.macos @@ -20,8 +20,8 @@ pipeline { /* Disable colors in Nim compiler logs */ NIMFLAGS = '--colors:off' /* Qt location is pre-defined */ - QTDIR = '/usr/local/qt' - PATH = "${env.QTDIR}/clang_64/bin:${env.PATH}" + QTDIR = '/usr/local/qt/clang_64' + PATH = "${env.QTDIR}/bin:${env.PATH}" /* Control output the filename */ STATUS_CLIENT_DMG = "pkg/${load('ci/lib.groovy').pkgFilename('macos', 'dmg')}" }