Commit 18ba5b7f authored by Tomas Krizek's avatar Tomas Krizek
Browse files

Merge branch 'fixup_mr_937' into 'master'

fixup! use js scheme detection

See merge request knot/knot-resolver!939
parents a3b91757 fe5f5906
Pipeline #59733 canceled with stages
in 7 minutes and 48 seconds
......@@ -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
......@@ -149,18 +152,13 @@ kres-gen:
build:darwin:
<<: *test_nodep
except:
refs:
- master
- 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
- branches@knot/security/knot-resolver
- master@knot/knot-resolver
variables:
- $SKIP_CI == "1"
start_in: 3 minutes # give the build in Travis CI time to finish
......@@ -312,7 +310,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 +387,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:
......
......@@ -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
......
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