From 5dca984c2590a993cfee671395e0165e8d2123b9 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Mon, 22 Jul 2024 10:24:24 +0300 Subject: [PATCH 1/5] Deploy docs to doc.openidentityplatform.org site --- .github/workflows/deploy.yml | 22 ++++++++++++++++++++++ openidm-doc/pom.xml | 1 + pom.xml | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 94fe71ef3..f36eab04f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -84,3 +84,25 @@ jobs: git add -A git commit -a -m "upload docs after deploy ${{ github.sha }}" git push --quiet --force + + - uses: actions/checkout@v4 + continue-on-error: true + with: + repository: OpenIdentityPlatform/doc.openidentityplatform.org + path: doc.openidentityplatform.org + + - name: Publish docs to site + continue-on-error: true + shell: bash + env: + GITHUB_ACTOR: ${{ github.actor }} + GITHUB_TOKEN: ${{ github.token }} + run: | + export REPO_NAME_LC=$(echo '${{github.event.repository.name}}' | tr '[:upper:]' '[:lower:]') + export SITE_DOC_FOLDER=${REPO_NAME_LC}-doc + cd doc.openidentityplatform.org + rm -rf ${REPO_NAME_LC} + mv ../${SITE_DOC_FOLDER}/target/docbkx/bootstrap ../doc.openidentityplatform.org/${REPO_NAME_LC} + git add -A + git commit -a -m "upload docs after deploy ${{ github.sha }}" + git push --quiet --force \ No newline at end of file diff --git a/openidm-doc/pom.xml b/openidm-doc/pom.xml index 48517d4fb..c68ba1651 100644 --- a/openidm-doc/pom.xml +++ b/openidm-doc/pom.xml @@ -67,6 +67,7 @@ pdf webhelp xhtml5 + bootstrap diff --git a/pom.xml b/pom.xml index 4708f6bef..50b770a14 100644 --- a/pom.xml +++ b/pom.xml @@ -183,7 +183,7 @@ 2.7 1.5 - 2.1.4 + 2.1.5-SNAPSHOT 1.0b3 From 0f687e169da35efabcf36b13c4088841bb8c7531 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Mon, 29 Jul 2024 13:49:39 +0300 Subject: [PATCH 2/5] Publish docs to https://doc.openidentityplatform.org --- .github/workflows/deploy.yml | 14 ++++++-------- .github/workflows/release.yml | 17 +++++++++++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f36eab04f..9f59a1490 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -71,7 +71,7 @@ jobs: with: repository: ${{ github.repository }}.wiki path: ${{ github.event.repository.name }}.wiki - - name: Publish docs in wiki + - name: Publish docs to wiki continue-on-error: true shell: bash env: @@ -80,7 +80,7 @@ jobs: run: | cd ${{ github.event.repository.name }}.wiki rm -rf docbkx - mv ../openidm-doc/target/docbkx ../${{ github.event.repository.name }}.wiki + cp -R ../openidm-doc/target/docbkx ../${{ github.event.repository.name }}.wiki git add -A git commit -a -m "upload docs after deploy ${{ github.sha }}" git push --quiet --force @@ -90,19 +90,17 @@ jobs: with: repository: OpenIdentityPlatform/doc.openidentityplatform.org path: doc.openidentityplatform.org + token: ${{ secrets.OIP_PAT_GH_TOKEN }} - name: Publish docs to site continue-on-error: true shell: bash - env: - GITHUB_ACTOR: ${{ github.actor }} - GITHUB_TOKEN: ${{ github.token }} run: | export REPO_NAME_LC=$(echo '${{github.event.repository.name}}' | tr '[:upper:]' '[:lower:]') export SITE_DOC_FOLDER=${REPO_NAME_LC}-doc cd doc.openidentityplatform.org rm -rf ${REPO_NAME_LC} - mv ../${SITE_DOC_FOLDER}/target/docbkx/bootstrap ../doc.openidentityplatform.org/${REPO_NAME_LC} + cp -R ../${SITE_DOC_FOLDER}/target/docbkx/bootstrap ../doc.openidentityplatform.org/${REPO_NAME_LC} git add -A - git commit -a -m "upload docs after deploy ${{ github.sha }}" - git push --quiet --force \ No newline at end of file + git commit -a -m "upload ${{github.event.repository.name}} docs after deploy ${{ github.sha }}" + git push --force \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 482fff47d..4c5f4c6ab 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -91,6 +91,23 @@ jobs: git tag -f ${{ github.event.inputs.releaseVersion }} git push --quiet --force git push --quiet --force origin ${{ github.event.inputs.releaseVersion }} + + - uses: actions/checkout@v4 + continue-on-error: true + with: + repository: OpenIdentityPlatform/doc.openidentityplatform.org + path: doc.openidentityplatform.org + token: ${{ secrets.OIP_PAT_GH_TOKEN }} + - name: Publish docs to site + continue-on-error: true + shell: bash + run: | + export REPO_NAME_LC=$(echo '${{github.event.repository.name}}' | tr '[:upper:]' '[:lower:]') + export TAG_NAME='${{github.event.repository.name}}-${{ github.event.inputs.releaseVersion }}' + cd doc.openidentityplatform.org + git tag -f '${TAG_NAME}' + git push --quiet --force origin '${TAG_NAME}' + release-docker: name: Docker release runs-on: 'ubuntu-latest' From 1a06f666af403df089757e7a1caa1499c0379541 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Mon, 29 Jul 2024 13:51:55 +0300 Subject: [PATCH 3/5] update commons-plugin version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 50b770a14..1e225123a 100644 --- a/pom.xml +++ b/pom.xml @@ -183,7 +183,7 @@ 2.7 1.5 - 2.1.5-SNAPSHOT + 2.1.5 1.0b3 From 092735eca99cb63a5f8ec3599a0ea2d8154e590c Mon Sep 17 00:00:00 2001 From: maximthomas Date: Tue, 30 Jul 2024 10:11:04 +0300 Subject: [PATCH 4/5] upgrade grunt-contrib-qunit to 10.1.1 --- openidm-ui/openidm-ui-admin/package.json | 2 +- openidm-ui/openidm-ui-enduser/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openidm-ui/openidm-ui-admin/package.json b/openidm-ui/openidm-ui-admin/package.json index e34753408..aab1e6e36 100644 --- a/openidm-ui/openidm-ui-admin/package.json +++ b/openidm-ui/openidm-ui-admin/package.json @@ -21,7 +21,7 @@ "grunt-cli": "1.2.0", "grunt-contrib-copy": "1.0.0", "grunt-contrib-less": "1.3.0", - "grunt-contrib-qunit": "8.0.1", + "grunt-contrib-qunit": "10.1.1", "grunt-contrib-requirejs": "1.0.0", "grunt-contrib-watch": "1.0.0", "grunt-eslint": "17.3.2", diff --git a/openidm-ui/openidm-ui-enduser/package.json b/openidm-ui/openidm-ui-enduser/package.json index b0575e3a5..378d361e8 100644 --- a/openidm-ui/openidm-ui-enduser/package.json +++ b/openidm-ui/openidm-ui-enduser/package.json @@ -21,7 +21,7 @@ "grunt-cli": "1.2.0", "grunt-contrib-copy": "1.0.0", "grunt-contrib-less": "1.3.0", - "grunt-contrib-qunit": "8.0.1", + "grunt-contrib-qunit": "10.1.1", "grunt-contrib-requirejs": "1.0.0", "grunt-contrib-watch": "1.0.0", "grunt-eslint": "17.3.2", From d37ffbc362ab898be1c33f85d89ba52646429365 Mon Sep 17 00:00:00 2001 From: maximthomas Date: Tue, 30 Jul 2024 11:31:56 +0300 Subject: [PATCH 5/5] remove commons-plugin version --- openidm-doc/pom.xml | 1 - pom.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/openidm-doc/pom.xml b/openidm-doc/pom.xml index c68ba1651..b04c82000 100644 --- a/openidm-doc/pom.xml +++ b/openidm-doc/pom.xml @@ -41,7 +41,6 @@ org.openidentityplatform.commons doc-maven-plugin - ${commons-plugin.version} build-man-pages diff --git a/pom.xml b/pom.xml index 1e225123a..f1a29becb 100644 --- a/pom.xml +++ b/pom.xml @@ -183,7 +183,6 @@ 2.7 1.5 - 2.1.5 1.0b3