Compare commits
2 Commits
v2023.4.5-
...
v2023.4.6-
Author | SHA1 | Date | |
---|---|---|---|
18eb2d30c5 | |||
06b1235707 |
25
Jenkinsfile
vendored
25
Jenkinsfile
vendored
@ -15,9 +15,9 @@ pipeline {
|
|||||||
script {
|
script {
|
||||||
withCredentials([
|
withCredentials([
|
||||||
usernamePassword([
|
usernamePassword([
|
||||||
credentialsId: 'forge-jenkins',
|
credentialsId: 'forge-jenkins',
|
||||||
usernameVariable: 'GIT_USERNAME',
|
usernameVariable: 'GIT_USERNAME',
|
||||||
passwordVariable: 'GIT_PASSWORD'
|
passwordVariable: 'GIT_PASSWORD'
|
||||||
])
|
])
|
||||||
]) {
|
]) {
|
||||||
sh '''
|
sh '''
|
||||||
@ -43,20 +43,21 @@ pipeline {
|
|||||||
script {
|
script {
|
||||||
withCredentials([
|
withCredentials([
|
||||||
usernamePassword([
|
usernamePassword([
|
||||||
credentialsId: 'forge-jenkins',
|
credentialsId: 'forge-jenkins',
|
||||||
usernameVariable: 'GITEA_RELEASE_USERNAME',
|
usernameVariable: 'GITEA_RELEASE_USERNAME',
|
||||||
passwordVariable: 'GITEA_RELEASE_PASSWORD'
|
passwordVariable: 'GITEA_RELEASE_PASSWORD'
|
||||||
])
|
])
|
||||||
]) {
|
]) {
|
||||||
sh 'make gitea-release'
|
sh 'make gitea-release'
|
||||||
}
|
}
|
||||||
def currentVersion = sh(returnStdout: true, script: 'make full-version').trim()
|
def currentVersion = sh(returnStdout: true, script: 'make full-version').trim()
|
||||||
build(
|
sh 'git status'
|
||||||
job: "../emissary-firmware/${env.GIT_BRANCH}",
|
// build(
|
||||||
parameters: [
|
// job: "../emissary-firmware/${env.GIT_BRANCH}",
|
||||||
[$class: 'StringParameterValue', name: 'emissaryRelease', value: currentVersion]
|
// parameters: [
|
||||||
]
|
// [$class: 'StringParameterValue', name: 'emissaryRelease', value: currentVersion]
|
||||||
)
|
// ]
|
||||||
|
// )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -202,10 +202,7 @@ func unexpectedHostRedirect(hostTarget string, acceptedHostPatterns ...string) f
|
|||||||
fn := func(w http.ResponseWriter, r *http.Request) {
|
fn := func(w http.ResponseWriter, r *http.Request) {
|
||||||
host, port, err := net.SplitHostPort(r.Host)
|
host, port, err := net.SplitHostPort(r.Host)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error(r.Context(), "could not split host/port", logger.E(errors.WithStack(err)))
|
host = r.Host
|
||||||
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
|
|
||||||
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
matched := wildcard.MatchAny(host, acceptedHostPatterns...)
|
matched := wildcard.MatchAny(host, acceptedHostPatterns...)
|
||||||
|
Reference in New Issue
Block a user