diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8834497..f554e6c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,6 +65,8 @@ jobs: DIR=`pwd` cd build/_output/docs zip -r ../docs.zip * + # Save the docs.zip + cp ../docs.zip /tmp - name: Build Binaries shell: bash @@ -75,6 +77,20 @@ jobs: mkdir -p ${CLI_TMP_BIN} || true cp -R bin/* ${CLI_TMP_BIN} + - name: Release GitHub Pages Stable.txt + shell: bash + run: | + git config --local user.name "Github Action" + git config --local user.email "$GITHUB_ACTOR@users.noreply.github.com" + make release-ghpages + # Restore the Binaries directories + CLI_TMP_BIN=/tmp/coherence-cli-bin + mkdir bin || true + cp -R ${CLI_TMP_BIN}/* bin/ + # Restore the docs.zip + mkdir -p ./build/_output + mv /tmp/docs.zip ./build/_output/docs.zip + - name: Create Release uses: actions/create-release@v1 id: create_release diff --git a/Makefile b/Makefile index 06a9bbc..06bee19 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # ====================================================================================================================== # The version of the CLI being build - this should be a valid SemVer format -VERSION ?= 1.10.0 +VERSION ?= 1.10.1 MILESTONE ?= SHELL := /bin/bash diff --git a/README.md b/README.md index 80c8b04..adc8316 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ manually copy to your desired location. For Windows, use the curl command below, then copy `cohctl.exe` to a directory in your PATH: ```cmd -curl -sLo cohctl.exe "https://github.com/oracle/coherence-cli/releases/download/1.9.1/cohctl-1.9.1-windows-amd64.exe" +curl -sLo cohctl.exe "https://github.com/oracle/coherence-cli/releases/download/1.10.0/cohctl-1.10.0-windows-amd64.exe" ``` > Note: Change the **amd64** to **arm** for ARM based processor in the URL above. diff --git a/docs/sitegen.yaml b/docs/sitegen.yaml index 7e698f3..32f808e 100644 --- a/docs/sitegen.yaml +++ b/docs/sitegen.yaml @@ -11,7 +11,7 @@ engine: attributes: plantumlconfig: "_plantuml-config.txt" commercial-docs-base-url: "https://docs.oracle.com/en/middleware/fusion-middleware/coherence/14.1.2" - cli-version: "1.10.0" + cli-version: "1.10.1" coherence-version: "14.1.2-0-2" coherence-default-version: "14.1.2-0-2" assets: @@ -35,7 +35,7 @@ backend: name: "vuetify" homePage: "docs/about/overview.adoc" releases: - - "1.10.0" + - "1.10.1" navigation: type: "ROOT" title: "Coherence CLI" diff --git a/scripts/release-ghpages.sh b/scripts/release-ghpages.sh index f6bc7fd..c07e625 100755 --- a/scripts/release-ghpages.sh +++ b/scripts/release-ghpages.sh @@ -37,21 +37,14 @@ git checkout --track origin/gh-pages git config pull.rebase true git pull -# Create docs directory pwd -rm -rf docs/${VERSION}/ || true -mkdir -p docs/${VERSION} || true -ls ${BUILD_OUTPUT}/docs/ -cp -R ${BUILD_OUTPUT}/docs/* docs/${VERSION}/ if [ -z "`echo $VERSION | grep RC`" ] ; then # Proper release so update stable.txt echo $VERSION > stable.txt # Update latest docs - rm -rf docs/latest || true - cp -R docs/${VERSION} docs/latest/ - git add -A stable.txt docs/latest/* docs/${VERSION}/* + git add -A stable.txt else # Must be RC git add -A docs/${VERSION}/*