From f0290a854cd4418ddb7d8b919ac369cc39398dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= <petr.spacek@nic.cz>
Date: Fri, 14 Feb 2020 17:44:18 +0100
Subject: [PATCH 1/3] fixup! use js scheme detection
---
modules/http/http.lua.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/http/http.lua.in b/modules/http/http.lua.in
index 7d022a448..70048265f 100644
--- a/modules/http/http.lua.in
+++ b/modules/http/http.lua.in
@@ -106,7 +106,7 @@ local function serve_root()
data = data
:gsub('{{ title }}', M.title or ('kresd @ ' .. hostname()))
:gsub('{{ host }}', hostname())
- return function (_, stream)
+ return function (_, _)
-- Render snippets
local rsnippets = {}
for _,v in pairs(M.snippets) do
--
GitLab
From e8ec2c0e7f1b500142acdb53e02c42fcefb0aac1 Mon Sep 17 00:00:00 2001
From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Mon, 17 Feb 2020 10:03:17 +0100
Subject: [PATCH 2/3] ci: run tests on contributor master branches
---
.gitlab-ci.yml | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce06e783b..525943bfa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,8 @@ stages:
stage: build
except:
refs:
- - master
+ - master@knot/knot-resolver
+ - master@knot/security/knot-resolver
variables:
- $SKIP_CI == "1"
artifacts:
@@ -110,7 +111,8 @@ kres-gen:
stage: test
except:
refs:
- - master
+ - master@knot/knot-resolver
+ - master@knot/security/knot-resolver
variables:
- $SKIP_CI == "1"
tags:
@@ -140,7 +142,8 @@ kres-gen:
stage: test
except:
refs:
- - master
+ - master@knot/knot-resolver
+ - master@knot/security/knot-resolver
variables:
- $SKIP_CI == "1"
dependencies: [] # do not download build artifacts
@@ -151,7 +154,7 @@ build:darwin:
<<: *test_nodep
except:
refs:
- - master
+ - master@knot/knot-resolver
- branches@knot/security/knot-resolver
variables:
- $SKIP_CI == "1"
@@ -159,7 +162,7 @@ build:darwin:
when: delayed
except: # trigger job only in repos under our control
refs:
- - master
+ - master@knot/knot-resolver
- branches@knot/security/knot-resolver
variables:
- $SKIP_CI == "1"
@@ -312,7 +315,8 @@ pytests:
- branches@knot/security/knot-resolver
except:
refs:
- - master
+ - master@knot/knot-resolver
+ - master@knot/security/knot-resolver
variables:
- $SKIP_CI == "1"
script:
@@ -388,7 +392,8 @@ fwd-udp6-unbound.tls6:
- branches@knot/security/knot-resolver
except:
refs:
- - master
+ - master@knot/knot-resolver
+ - master@knot/security/knot-resolver
variables:
- $SKIP_CI == "1"
script:
--
GitLab
From fe5f5906583474df11ae28cc8d93a13448a90c35 Mon Sep 17 00:00:00 2001
From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Mon, 17 Feb 2020 10:30:05 +0100
Subject: [PATCH 3/3] ci: fix job conditions for build:darwin
---
.gitlab-ci.yml | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 525943bfa..a34446ae4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -152,18 +152,13 @@ kres-gen:
build:darwin:
<<: *test_nodep
- except:
- refs:
- - master@knot/knot-resolver
- - branches@knot/security/knot-resolver
- variables:
- - $SKIP_CI == "1"
- - $SKIP_TRAVIS == "1"
when: delayed
- except: # trigger job only in repos under our control
+ only: # trigger job only in the main repo
+ refs:
+ - branches@knot/knot-resolver
+ except:
refs:
- master@knot/knot-resolver
- - branches@knot/security/knot-resolver
variables:
- $SKIP_CI == "1"
start_in: 3 minutes # give the build in Travis CI time to finish
--
GitLab