From: Oto Šťáva <oto.stava@nic.cz>
Date: Tue, 16 Apr 2024 13:40:04 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into 6.0
X-Git-Tag: v6.0.8~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fenvironments%2Fdocs-develop-6-0-mvwoqi%2Fdeployments%2F3800;p=thirdparty%2Fknot-resolver.git

Merge remote-tracking branch 'origin/master' into 6.0
---

2230909b7e322e9b5aa0f2921d09690215a52dcb
diff --cc .gitlab-ci.yml
index ef3ddde14,66e63419e..5a13e7fc0
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -733,17 -815,24 +733,35 @@@ docs:release
        - doc/html
    environment:
      name: docs-release/$CI_COMMIT_TAG
 -    url: https://$CI_PROJECT_NAMESPACE.pages.nic.cz/-/knot-resolver/-/jobs/$CI_JOB_ID/artifacts/doc/html/index.html
 +    url: https://www.knot-resolver.cz/documentation/artifacts/$CI_JOB_ID/index.html
 +
 +# This job deploys the current docs as <https://knot.pages.nic.cz/knot-resolver>
 +pages:
 +  stage: deploy
 +  needs:
 +    - docs:build
 +  script: mv doc/html public
 +  when: manual
 +  artifacts:
 +    paths:
 +      - public
  
+ # This job pushes the Knot Resolver documentation into a new branch of the
+ # `websites/knot-resolver.cz` repository.
+ docs:website:
+   stage: deploy
+   needs:
+     - docs:build
+   when: manual
+   variables:
+   script:
+     - "SRC_COMMIT_REF=\"$CI_COMMIT_TAG$CI_COMMIT_BRANCH$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME\""
+     - "git clone \"https://gitlab-ci-token:$WEBSITE_DOCS_CI_TOKEN@$CI_SERVER_HOST:$CI_SERVER_PORT/websites/knot-resolver.cz.git\" website"
+     - "cp --recursive --verbose \"doc/html\" \"website/content/documentation/$SRC_COMMIT_REF\""
+     - cd website
+     - "git checkout -b \"docs/$SRC_COMMIT_REF\""
+     - "git add \"content/documentation/$SRC_COMMIT_REF\""
+     - "git commit -m \"docs: $SRC_COMMIT_REF\""
+     - "git push --force --set-upstream origin \"docs/$SRC_COMMIT_REF\""
+ 
  # }}}