From d9178e792d3d614ba3a24dc274837fa76ca0f34a Mon Sep 17 00:00:00 2001 From: Arswarog Date: Mon, 15 Jun 2026 09:32:28 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=BF=D0=B5=D1=80=D0=B5=D1=85=D0=BE?= =?UTF-8?q?=D0=B4=20=D0=BD=D0=B0=20jt4d-wiki.ru.net?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- action.yml | 11 +++++++---- docusaurus/.docuservix.yml | 1 - docusaurus/docusaurus.config.ts | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/action.yml b/action.yml index c0b8f6d..161223d 100644 --- a/action.yml +++ b/action.yml @@ -20,13 +20,15 @@ runs: ORG="${{ github.repository_owner }}" if [[ "$REF" == "main" || "$REF" == "master" ]]; then - URL="http://${REPO}.${ORG}.docs.jt4d.ru.net" + URL="http://${REPO}.${ORG}.jt4d-wiki.ru.net" + S3_PATH="${ORG}.${REPO}" else - URL="http://${REF}.${REPO}.${ORG}.docs.jt4d.ru.net" + URL="http://${REF}.${REPO}.${ORG}.jt4d-wiki.ru.net" + S3_PATH="${ORG}.${REPO}.${REF}" fi echo "TARGET_URL=$URL" >> $GITHUB_ENV - echo "S3_PATH=${ORG}.${REPO}.${REF}" >> $GITHUB_ENV + echo "S3_PATH=$S3_PATH" >> $GITHUB_ENV - name: Set docs status pending shell: bash @@ -65,6 +67,7 @@ runs: working-directory: ${{ github.action_path }}/docusaurus env: DOCUSERVIX_ON_BROKEN_LINKS: ${{ inputs.on-broken-links }} + DOCUSERVIX_URL: ${{ env.TARGET_URL }} run: yarn docusaurus build --out-dir ${{ github.workspace }}/generated-docs - name: Upload to S3 @@ -74,7 +77,7 @@ runs: AWS_SECRET_ACCESS_KEY: ${{ vars.DOCUSERVIX_S3_SECRET }} run: | aws s3 sync generated-docs/ \ - s3://${{ vars.DOCUSERVIX_S3_BUCKET }}/docs.${{ env.S3_PATH }}\ + s3://${{ vars.DOCUSERVIX_S3_BUCKET }}/${{ env.S3_PATH }}\ --endpoint-url ${{ vars.DOCUSERVIX_S3_URL }} \ --acl public-read \ --delete diff --git a/docusaurus/.docuservix.yml b/docusaurus/.docuservix.yml index ec63b53..686e6e2 100644 --- a/docusaurus/.docuservix.yml +++ b/docusaurus/.docuservix.yml @@ -1,5 +1,4 @@ title: "Title example" -url: "https://example.docs.jt4d.ru" project: org: "example" repo: "example" diff --git a/docusaurus/docusaurus.config.ts b/docusaurus/docusaurus.config.ts index be6b605..d8a76c9 100644 --- a/docusaurus/docusaurus.config.ts +++ b/docusaurus/docusaurus.config.ts @@ -7,7 +7,6 @@ import type {NavbarItem} from '@docusaurus/theme-common' interface DocsConfig { title: string; - url: string; project: { org: string; repo: string }; dirs?: { docs?: string; blog?: string }; } @@ -16,9 +15,10 @@ const docsConfig = yaml.load(fs.readFileSync('./.docuservix.yml', 'utf8')) as Do const { title, - url, } = docsConfig +const url = process.env.DOCUSERVIX_URL; + const { org, repo