diff --git a/.github/workflows/respec.yaml b/.github/workflows/respec.yaml index 8f7ce116f4..137344cc2e 100644 --- a/.github/workflows/respec.yaml +++ b/.github/workflows/respec.yaml @@ -34,11 +34,6 @@ jobs: - name: Install dependencies run: npm ci - - uses: actions/checkout@v4 - with: - ref: main - path: docs/deploy - - name: run main script run: scripts/md2html/build.sh @@ -49,7 +44,7 @@ jobs: branch: update-respec-version base: main delete-branch: true - path: docs/deploy + path: docs labels: Housekeeping reviewers: TSC title: Update ReSpec versions diff --git a/.gitignore b/.gitignore index a19835db8f..eff8bf43c3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,5 @@ target atlassian-ide-plugin.xml node_modules/ -deploy/ history Gemfile.lock diff --git a/docs/.gitignore b/docs/.gitignore index 42ff7bf226..57510a2be4 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -1,2 +1 @@ _site/ -deploy/ diff --git a/scripts/md2html/build.sh b/scripts/md2html/build.sh index e5ba804407..0c0412f3d5 100755 --- a/scripts/md2html/build.sh +++ b/scripts/md2html/build.sh @@ -5,9 +5,6 @@ # run this script from the root of the repo. It is designed to be run by a GitHub workflow. # It contains bashisms -mkdir -p deploy/oas -mkdir -p deploy/js - cd scripts/md2html mkdir -p history cat > history/MAINTAINERS_v2.0.md < /dev/null -cp -p markdown/* ../../deploy/ 2> /dev/null +cp -p js/* ../../docs/js 2> /dev/null +cp -p markdown/* ../../docs/ 2> /dev/null latest=`git describe --abbrev=0 --tags` latestCopied=none for filename in ../../versions/[23456789].*.md ; do version=$(basename "$filename" .md) - node md2html.js --respec --maintainers ./history/MAINTAINERS_v$version.md ${filename} > ../../deploy/oas/v$version.html + node md2html.js --respec --maintainers ./history/MAINTAINERS_v$version.md ${filename} > ../../docs/oas/v$version.html if [ $version = $latest ]; then if [[ ${version} != *"rc"* ]];then # version is not a Release Candidate - cp -p ../../deploy/oas/v$version.html ../../deploy/oas/latest.html + cp -p ../../docs/oas/v$version.html ../../docs/oas/latest.html latestCopied=v$version fi fi