From c8ebff54b395d8590aa0d138d959599432d62108 Mon Sep 17 00:00:00 2001 From: Casper Welzel Andersen Date: Thu, 18 May 2023 17:12:03 +0200 Subject: [PATCH] Fix logic for checking documentation framework --- .github/workflows/cd_release.yml | 9 +++++---- .github/workflows/ci_cd_updated_default_branch.yml | 9 +++++---- .github/workflows/ci_tests.yml | 2 ++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cd_release.yml b/.github/workflows/cd_release.yml index c0df5d99..e05beabd 100644 --- a/.github/workflows/cd_release.yml +++ b/.github/workflows/cd_release.yml @@ -318,10 +318,11 @@ jobs: steps: - name: Check input run: | - if [[ "${{ inputs.docs_framework }}" != "mkdocs" || "${{ inputs.docs_framework }}" != "sphinx" ]]; then - echo "The input 'docs_framework' must be either 'mkdocs' or 'sphinx' !" - echo "Found value: ${{ inputs.docs_framework }}" - exit 1 + valid_frameworks=("mkdocs sphinx") + if [[ ! " ${valid_frameworks[*]} " =~ " ${{ inputs.docs_framework}} " ]]; then + echo "The input '${{ inputs.docs_framework}}' is not supported." + echo "Valid inputs are: ${valid_frameworks[*]}" + exit 1 fi - name: Checkout ${{ github.repository }} diff --git a/.github/workflows/ci_cd_updated_default_branch.yml b/.github/workflows/ci_cd_updated_default_branch.yml index 1fa9d06b..b2851e22 100644 --- a/.github/workflows/ci_cd_updated_default_branch.yml +++ b/.github/workflows/ci_cd_updated_default_branch.yml @@ -166,10 +166,11 @@ jobs: steps: - name: Check input run: | - if [[ "${{ inputs.docs_framework }}" != "mkdocs" || "${{ inputs.docs_framework }}" != "sphinx" ]]; then - echo "The input 'docs_framework' must be either 'mkdocs' or 'sphinx' !" - echo "Found value: ${{ inputs.docs_framework }}" - exit 1 + valid_frameworks=("mkdocs sphinx") + if [[ ! " ${valid_frameworks[*]} " =~ " ${{ inputs.docs_framework}} " ]]; then + echo "The input '${{ inputs.docs_framework}}' is not supported." + echo "Valid inputs are: ${valid_frameworks[*]}" + exit 1 fi - name: Release check diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index bd8d917e..bc592b14 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -318,9 +318,11 @@ jobs: ("${{ inputs.use_mkdocs }}" == "false" && "${{ inputs.use_sphinx }}" == "false") || \ ("${{ inputs.use_mkdocs }}" == "true" && "${{ inputs.use_sphinx }}" == "false") ]]; then # (Default to) using MkDocs + echo "Framework determined: MkDocs" echo "framework=mkdocs" >> $GITHUB_ENV elif [[ "${{ inputs.use_mkdocs }}" == "false" && "${{ inputs.use_sphinx }}" == "true" ]]; then # Use Sphinx + echo "Framework determined: Sphinx" echo "framework=sphinx" >> $GITHUB_ENV else echo "Could not determine what documentation framework to use."