From 047551baa9ae750ea9367d59d0084afe8b688f3e Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Wed, 28 Sep 2022 14:24:32 +0100 Subject: [PATCH 1/9] chore: adding apk add rsync command --- .github/workflows/deploy-docs.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index ffbaaf99cd1..b233ae18a3d 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -2,6 +2,7 @@ name: Deploy docs # This job builds and deploys documenation to github pages. # It runs on every push to main with a change in the docs folder. on: + workflow_dispatch: push: branches: - main @@ -30,7 +31,7 @@ jobs: - name: Build 🔧 run: | - git config --global --add safe.directory /__w/ibc-go/ibc-go + apk add rsync make build-docs LEDGER_ENABLED=false - name: Deploy 🚀 From b1eba86c74d7f39842d52a07d3c39206fa69d90c Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Wed, 28 Sep 2022 14:25:01 +0100 Subject: [PATCH 2/9] chore: temporarily adding on push --- .github/workflows/deploy-docs.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index b233ae18a3d..1dceb821100 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -1,15 +1,15 @@ name: Deploy docs # This job builds and deploys documenation to github pages. # It runs on every push to main with a change in the docs folder. -on: - workflow_dispatch: - push: - branches: - - main - - "release/**" - paths: - - "docs/**" - - .github/workflows/deploy-docs.yml +on: push +# workflow_dispatch: +# push: +# branches: +# - main +# - "release/**" +# paths: +# - "docs/**" +# - .github/workflows/deploy-docs.yml permissions: contents: read From fb59623b316f361bf27f66ff7db47982161ac5e5 Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Wed, 28 Sep 2022 14:28:50 +0100 Subject: [PATCH 3/9] chore: revert to tendermint image --- .github/workflows/deploy-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 1dceb821100..cf2736ffe75 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -20,7 +20,7 @@ jobs: contents: write # for JamesIves/github-pages-deploy-action to push changes in repo runs-on: ubuntu-latest container: - image: ghcr.io/cosmos/website-deployment + image: tendermintdev/docker-website-deployment steps: - name: Checkout 🛎️ uses: actions/checkout@v3 From 50b504bf8499d2f10665bf0ea27e0ad8ae3194af Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Wed, 28 Sep 2022 15:14:23 +0100 Subject: [PATCH 4/9] chore: temporarily strip down versions file --- .github/workflows/deploy-docs.yml | 4 ++-- docs/versions | 16 ---------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index cf2736ffe75..e00a6b85b73 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -20,7 +20,7 @@ jobs: contents: write # for JamesIves/github-pages-deploy-action to push changes in repo runs-on: ubuntu-latest container: - image: tendermintdev/docker-website-deployment + image: ghcr.io/cosmos/website-deployment steps: - name: Checkout 🛎️ uses: actions/checkout@v3 @@ -31,7 +31,7 @@ jobs: - name: Build 🔧 run: | - apk add rsync + git config --global --add safe.directory /__w/ibc-go/ibc-go make build-docs LEDGER_ENABLED=false - name: Deploy 🚀 diff --git a/docs/versions b/docs/versions index bb849971219..775e61b4d3d 100644 --- a/docs/versions +++ b/docs/versions @@ -1,17 +1 @@ -release/v4.1.x v4.1.0 -release/v4.0.x v4.0.0 -release/v3.3.x v3.3.0 -release/v3.2.x v3.2.0 -release/v3.1.x v3.1.0 -release/v3.0.x v3.0.0 -release/v2.4.x v2.4.0 -release/v2.3.x v2.3.0 -release/v2.2.x v2.2.0 -release/v2.1.x v2.1.0 -release/v2.0.x v2.0.0 -release/v1.5.x v1.5.0 -release/v1.4.x v1.4.0 -release/v1.3.x v1.3.0 -release/v1.2.x v1.2.0 -release/v1.1.x v1.1.0 main main From 856d77321be73b98003c5dc88c48fec5009f2900 Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Wed, 28 Sep 2022 15:19:28 +0100 Subject: [PATCH 5/9] chore: removing values from package.json --- docs/package-lock.json | 15 --------------- docs/package.json | 2 -- 2 files changed, 17 deletions(-) diff --git a/docs/package-lock.json b/docs/package-lock.json index 0c725a78b51..cd77a546287 100644 --- a/docs/package-lock.json +++ b/docs/package-lock.json @@ -9,8 +9,6 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "eventsource": "^2.0.2", - "vue": "^2.6.14", "vuepress-theme-cosmos": "^1.0.183" } }, @@ -6254,14 +6252,6 @@ "node": ">=0.8.x" } }, - "node_modules/eventsource": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz", - "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==", - "engines": { - "node": ">=12.0.0" - } - }, "node_modules/evp_bytestokey": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", @@ -19106,11 +19096,6 @@ "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" }, - "eventsource": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz", - "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==" - }, "evp_bytestokey": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", diff --git a/docs/package.json b/docs/package.json index 7b79f574a22..89dfa64033f 100644 --- a/docs/package.json +++ b/docs/package.json @@ -13,8 +13,6 @@ "author": "", "license": "ISC", "dependencies": { - "eventsource": "^2.0.2", - "vue": "^2.6.14", "vuepress-theme-cosmos": "^1.0.183" } } From 84073158ff654fabe4d89eedddd573b9d167b8c7 Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Wed, 28 Sep 2022 15:50:35 +0100 Subject: [PATCH 6/9] chore: adding 404 file --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index efd9fc2ba78..a92b39e0c52 100644 --- a/Makefile +++ b/Makefile @@ -203,6 +203,7 @@ build-docs: mkdir -p ~/output/$${path_prefix} ; \ cp -r .vuepress/dist/* ~/output/$${path_prefix}/ ; \ cp ~/output/$${path_prefix}/index.html ~/output ; \ + cp ~/output/$${path_prefix}/404.html ~/output ; \ done < versions ; view-docs: From 05d6fed1ea1d5cfd90d1dd27f562d7acbb489662 Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Wed, 28 Sep 2022 15:57:37 +0100 Subject: [PATCH 7/9] chore: change vuepress config --- docs/.vuepress/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 3be1b49c61f..9aee229d2c0 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -464,7 +464,7 @@ module.exports = { [ "sitemap", { - hostname: "https://ibc.cosmos.network", + hostname: "https://cosmos.github.io/ibc-go", }, ], ], From d39e0a78749a1048bb278f4c12b14cef91289a6c Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Thu, 29 Sep 2022 09:10:53 +0100 Subject: [PATCH 8/9] chore: revert hostname --- docs/.vuepress/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 9aee229d2c0..3be1b49c61f 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -464,7 +464,7 @@ module.exports = { [ "sitemap", { - hostname: "https://cosmos.github.io/ibc-go", + hostname: "https://ibc.cosmos.network", }, ], ], From b7f6a3c0a146bb27efa3c68d17bb3f1d4af0c7a4 Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Thu, 29 Sep 2022 10:19:21 +0100 Subject: [PATCH 9/9] chore: reverting versions and adding workflow_dispatch --- .github/workflows/deploy-docs.yml | 18 +++++++++--------- docs/versions | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index e00a6b85b73..3a7866038d0 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -1,15 +1,15 @@ name: Deploy docs # This job builds and deploys documenation to github pages. # It runs on every push to main with a change in the docs folder. -on: push -# workflow_dispatch: -# push: -# branches: -# - main -# - "release/**" -# paths: -# - "docs/**" -# - .github/workflows/deploy-docs.yml +on: + workflow_dispatch: + push: + branches: + - main + - "release/**" + paths: + - "docs/**" + - .github/workflows/deploy-docs.yml permissions: contents: read diff --git a/docs/versions b/docs/versions index 775e61b4d3d..bb849971219 100644 --- a/docs/versions +++ b/docs/versions @@ -1 +1,17 @@ +release/v4.1.x v4.1.0 +release/v4.0.x v4.0.0 +release/v3.3.x v3.3.0 +release/v3.2.x v3.2.0 +release/v3.1.x v3.1.0 +release/v3.0.x v3.0.0 +release/v2.4.x v2.4.0 +release/v2.3.x v2.3.0 +release/v2.2.x v2.2.0 +release/v2.1.x v2.1.0 +release/v2.0.x v2.0.0 +release/v1.5.x v1.5.0 +release/v1.4.x v1.4.0 +release/v1.3.x v1.3.0 +release/v1.2.x v1.2.0 +release/v1.1.x v1.1.0 main main