From 0e6a3f6721df7aab2bcb45fc707f7189ac80890a Mon Sep 17 00:00:00 2001 From: Matej Sima Date: Thu, 6 Jun 2019 15:45:45 +0200 Subject: [PATCH] Update website versioning workflow --- .gitlab-ci.yml | 8 ++++---- gitlab-pages/.gitignore | 2 ++ gitlab-pages/website/package.json | 2 ++ gitlab-pages/website/pages/en/versions.js | 8 +------- gitlab-pages/website/postversion.js | 1 + gitlab-pages/website/{removeNext.js => preversion.js} | 0 .../versioned_docs/version-next/setup-installation.md | 2 ++ gitlab-pages/website/versions.json | 4 +--- 8 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 gitlab-pages/website/postversion.js rename gitlab-pages/website/{removeNext.js => preversion.js} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6fc7854ac..4dbf2bf3f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,13 +15,11 @@ stages: - cd gitlab-pages/website - npm install script: - - rm -rf versioned_docs/version-next - - rm versioned_sidebars/version-next-sidebars.json - - node removeNext.js - npm run version next - npm run build + after_script: - cd ../.. - - cp -r gitlab-pages/website/build/ligo public + - cp -r gitlab-pages/website/build/ligo public artifacts: paths: - public @@ -121,6 +119,8 @@ stages: - master +# Pages are deployed from both master & dev, be careful not to override 'next' +# in case something gets merged into 'dev' while releasing. pages: <<: *website_build # only: diff --git a/gitlab-pages/.gitignore b/gitlab-pages/.gitignore index 5395ea795..3f87a979e 100644 --- a/gitlab-pages/.gitignore +++ b/gitlab-pages/.gitignore @@ -10,3 +10,5 @@ website/build/ website/yarn.lock website/node_modules website/i18n/* +website/versioned_docs/version-next +website/versioned_sidebars/version-next-sidebars.json \ No newline at end of file diff --git a/gitlab-pages/website/package.json b/gitlab-pages/website/package.json index e2dbb5afb..082937488 100644 --- a/gitlab-pages/website/package.json +++ b/gitlab-pages/website/package.json @@ -6,6 +6,8 @@ "publish-gh-pages": "docusaurus-publish", "write-translations": "docusaurus-write-translations", "version": "docusaurus-version", + "preversion": "node preversion.js", + "postversion": "node postversion.js", "rename-version": "docusaurus-rename-version" }, "devDependencies": { diff --git a/gitlab-pages/website/pages/en/versions.js b/gitlab-pages/website/pages/en/versions.js index 663a91167..a123ea192 100644 --- a/gitlab-pages/website/pages/en/versions.js +++ b/gitlab-pages/website/pages/en/versions.js @@ -28,7 +28,6 @@ function Versions(props) {

{siteConfig.title} Versions

-

New versions of this project are released every so often.

Current version (Stable)

@@ -53,10 +52,6 @@ function Versions(props) {
-

- This is the version that is configured automatically when you first - install this project. -

Pre-release versions

@@ -78,14 +73,13 @@ function Versions(props) {
-

Other text describing this section.

Past Versions

Here you can find previous versions of the documentation.

{versions.map( version => - version !== latestVersion && ( + version !== latestVersion && version !== "next" && (
{version} diff --git a/gitlab-pages/website/postversion.js b/gitlab-pages/website/postversion.js new file mode 100644 index 000000000..b53c4a1d0 --- /dev/null +++ b/gitlab-pages/website/postversion.js @@ -0,0 +1 @@ +require('./preversion'); \ No newline at end of file diff --git a/gitlab-pages/website/removeNext.js b/gitlab-pages/website/preversion.js similarity index 100% rename from gitlab-pages/website/removeNext.js rename to gitlab-pages/website/preversion.js diff --git a/gitlab-pages/website/versioned_docs/version-next/setup-installation.md b/gitlab-pages/website/versioned_docs/version-next/setup-installation.md index 424611dde..94e809cbb 100644 --- a/gitlab-pages/website/versioned_docs/version-next/setup-installation.md +++ b/gitlab-pages/website/versioned_docs/version-next/setup-installation.md @@ -34,4 +34,6 @@ ligo --help For now, please refer to the steps described in the [Dockerfile](https://github.com/stove-labs/granary/blob/develop/docker/ligo/Dockerfile). +## next-2 + diff --git a/gitlab-pages/website/versions.json b/gitlab-pages/website/versions.json index 630ba2cc6..27dbe6f91 100644 --- a/gitlab-pages/website/versions.json +++ b/gitlab-pages/website/versions.json @@ -1,3 +1 @@ -[ - "next" -] +["0.0.1"] \ No newline at end of file