From c330fe267f14b3a7ef0e0b95b315012771a14c9c Mon Sep 17 00:00:00 2001 From: Zdenek Jonas Date: Mon, 11 Jul 2022 11:44:46 +0200 Subject: [PATCH 1/4] Update antora-build.yml --- .github/workflows/antora-build.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/antora-build.yml b/.github/workflows/antora-build.yml index 221d71885..d729eef54 100644 --- a/.github/workflows/antora-build.yml +++ b/.github/workflows/antora-build.yml @@ -8,16 +8,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: fusion-engineering/setup-git-credentials@v2 - with: - credentials: ${{secrets.GIT_CREDENTIALS}} - name: Antora Site with Lunr Search uses: ghost-420/antora-lunr-site-action@v1.0 with: antora_playbook: antora-playbook.yml site_sources_path: "" - env: - GIT_CREDENTIALS: ${{secrets.GIT_CREDENTIALS}} - name: Deploy to site branch uses: JamesIves/github-pages-deploy-action@4.1.2 with: From 771ab62ec92daf42079064912b16dd0e701d0d99 Mon Sep 17 00:00:00 2001 From: Zdenek Jonas Date: Mon, 11 Jul 2022 11:54:03 +0200 Subject: [PATCH 2/4] Update antora-build.yml --- .github/workflows/antora-build.yml | 37 ++++++++++++++++++------------ 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/.github/workflows/antora-build.yml b/.github/workflows/antora-build.yml index d729eef54..f6c60903e 100644 --- a/.github/workflows/antora-build.yml +++ b/.github/workflows/antora-build.yml @@ -7,18 +7,25 @@ jobs: antora: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Antora Site with Lunr Search - uses: ghost-420/antora-lunr-site-action@v1.0 - with: - antora_playbook: antora-playbook.yml - site_sources_path: "" - - name: Deploy to site branch - uses: JamesIves/github-pages-deploy-action@4.1.2 - with: - branch: site # The branch the action should deploy to. - folder: site # The folder the action should deploy. - clean-exclude: > - index.html - api/ - token: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/checkout@v2 + + - name: repo.microstream.one:18081 docker registry login + run: echo "${{ secrets.DOCKER_REPO_PASSWORD }}" | docker login repo.microstream.one:18081 -u "${{ secrets.DOCKER_REPO_USER }}" --password-stdin + + - name: generate antora + run: | + docker run --rm -i \ + -u $(id -u) + -v $PWD:/antora:Z + -w /workspace/source \ + repo.microstream.one:18081/antora:0.1 \ + antora-playbook.yml + - name: Deploy to site branch + uses: JamesIves/github-pages-deploy-action@4.1.2 + with: + branch: site # The branch the action should deploy to. + folder: site # The folder the action should deploy. + clean-exclude: > + index.html + api/ + token: ${{ secrets.GITHUB_TOKEN }} From 02499295caf28fe1b55a86aa726d678f2c582e1d Mon Sep 17 00:00:00 2001 From: Zdenek Jonas Date: Mon, 11 Jul 2022 12:00:17 +0200 Subject: [PATCH 3/4] Update antora-build.yml --- .github/workflows/antora-build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/antora-build.yml b/.github/workflows/antora-build.yml index f6c60903e..82742be74 100644 --- a/.github/workflows/antora-build.yml +++ b/.github/workflows/antora-build.yml @@ -14,10 +14,11 @@ jobs: - name: generate antora run: | - docker run --rm -i \ - -u $(id -u) - -v $PWD:/antora:Z + docker run \ + -u $(id -u) \ + -v $PWD:/antora:Z \ -w /workspace/source \ + --rm -t \ repo.microstream.one:18081/antora:0.1 \ antora-playbook.yml - name: Deploy to site branch From 584cb6c6330fd978d650f3620fed68d0a983b500 Mon Sep 17 00:00:00 2001 From: Zdenek Jonas Date: Mon, 11 Jul 2022 12:02:05 +0200 Subject: [PATCH 4/4] Update antora-build.yml --- .github/workflows/antora-build.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/antora-build.yml b/.github/workflows/antora-build.yml index 82742be74..51eb48dc0 100644 --- a/.github/workflows/antora-build.yml +++ b/.github/workflows/antora-build.yml @@ -14,13 +14,7 @@ jobs: - name: generate antora run: | - docker run \ - -u $(id -u) \ - -v $PWD:/antora:Z \ - -w /workspace/source \ - --rm -t \ - repo.microstream.one:18081/antora:0.1 \ - antora-playbook.yml + docker run -u $(id -u) -v $PWD:/antora:Z --rm -t repo.microstream.one:18081/antora:0.1 antora-playbook.yml - name: Deploy to site branch uses: JamesIves/github-pages-deploy-action@4.1.2 with: