|
|
@ -191,8 +191,8 @@
|
|
|
|
(defn-spec generate-website-build-secret pred/map-or-seq?
|
|
|
|
(defn-spec generate-website-build-secret pred/map-or-seq?
|
|
|
|
[config websiteconfig?
|
|
|
|
[config websiteconfig?
|
|
|
|
auth websiteauth?]
|
|
|
|
auth websiteauth?]
|
|
|
|
(let [{:keys [gitea-host
|
|
|
|
(let [{:keys [forgejo-host
|
|
|
|
gitea-repo
|
|
|
|
forgejo-repo
|
|
|
|
branchname]} config
|
|
|
|
branchname]} config
|
|
|
|
{:keys [authtoken
|
|
|
|
{:keys [authtoken
|
|
|
|
username]} auth]
|
|
|
|
username]} auth]
|
|
|
@ -201,13 +201,13 @@
|
|
|
|
(cm/replace-all-matching-values-by-new-value "TOKEN" (b64/encode authtoken))
|
|
|
|
(cm/replace-all-matching-values-by-new-value "TOKEN" (b64/encode authtoken))
|
|
|
|
(cm/replace-all-matching-values-by-new-value "REPOURL" (b64/encode
|
|
|
|
(cm/replace-all-matching-values-by-new-value "REPOURL" (b64/encode
|
|
|
|
(generate-gitrepourl
|
|
|
|
(generate-gitrepourl
|
|
|
|
gitea-host
|
|
|
|
forgejo-host
|
|
|
|
gitea-repo
|
|
|
|
forgejo-repo
|
|
|
|
username
|
|
|
|
username
|
|
|
|
branchname)))
|
|
|
|
branchname)))
|
|
|
|
(cm/replace-all-matching-values-by-new-value "COMMITURL" (b64/encode
|
|
|
|
(cm/replace-all-matching-values-by-new-value "COMMITURL" (b64/encode
|
|
|
|
(generate-gitcommiturl
|
|
|
|
(generate-gitcommiturl
|
|
|
|
gitea-host
|
|
|
|
forgejo-host
|
|
|
|
gitea-repo
|
|
|
|
forgejo-repo
|
|
|
|
username))))))
|
|
|
|
username))))))
|
|
|
|
|
|
|
|
|
|
|
|