Merge pull request #4376 from duncanbeevers/dev-schemas-live-in-src

Update schema-publish.sh

Author: ralfhandl

package.json

@@ -14,7 +14,7 @@
   "license": "Apache-2.0",
   "scripts": {
     "build": "bash ./scripts/md2html/build.sh",
-    "build-src": "npm run validate-markdown && bash ./scripts/md2html/build.sh src",
+    "build-src": "npm run validate-markdown && bash ./scripts/md2html/build.sh src && bash ./scripts/schema-publish.sh src",
     "test": "c8 --100 vitest --watch=false && bash scripts/schema-test-coverage.sh",
     "format-markdown": "bash ./scripts/format-markdown.sh ./src/oas.md",
     "validate-markdown": "npx mdv src/oas.md && npx markdownlint-cli src/oas.md"

scripts/schema-publish.sh

@@ -6,15 +6,61 @@
 
 schemaDir="src/schemas/validation"
 branch=$(git branch --show-current)
-version=${branch:1:3}
-echo === Building schemas into ./deploy/oas/$version
+
+
+if [ -z "$1" ]; then
+  if [[ $branch =~ ^v([0-9]+\.[0-9]+)-dev$ ]]; then
+    deploydir="./deploy/oas/${BASH_REMATCH[1]}"
+  else
+    echo "Unable to determine version from branch name; should be vMAJOR.MINOR.PATCH-dev"
+    exit 1
+  fi
+elif [ $1 = "src" ]; then
+  deploydir="./deploy-preview"
+else
+  echo "Unrecognized argument"
+  exit 1
+fi
+
+# create the date-stamped schemas
+publish_schema() {
+  local schema="$1"
+  local date="$2"
+  local sedCmd="$3"
+
+  local base=$(basename $schema '.yaml')
+  local target=$deploydir/$base/$date
+
+  mkdir -p $deploydir/$base
+  # replace the WORK-IN-PROGRESS placeholders
+  sed -e $sedCmd $schemaDir/$schema > $target.yaml
+
+  node scripts/yaml2json/yaml2json.js "$target.yaml"
+  rm "$target.yaml"
+  mv "$target.json" "$target"
+
+  # Find the jekyll lander markdown file for this iteration.
+  local jekyllLander=$(find "$deploydir/$base" -maxdepth 1 -name "*.md")
+
+  # Move the jekyll lander markdown for this iteration to the deploy destination.
+  # The lander files only exist in the gh-pages branch.
+  if [ ! -z "$jekyllLander" ]; then
+    mv $jekyllLander $target.md
+    echo " * $newestCommitDate: $schema & jekyll lander $(basename $jekyllLander)"
+  else
+    echo " * $newestCommitDate: $schema"
+  fi
+
+}
+
+echo === Building schemas into $deploydir
 
 # list of schemas to process, dependent schemas come first
 schemas=(meta.yaml dialect.yaml schema.yaml schema-base.yaml)
 
-# find the newest commit date for each schema
+# publish each schema using its or any of its dependencies newest commit date.
 maxDate=""
-declare -A datesHash
+sedCmds=()
 for schema in "${schemas[@]}"; do
   if [ -f  "$schemaDir/$schema" ]; then
     newestCommitDate=$(git log -1 --format="%ad" --date=short "$schemaDir/$schema")
@@ -23,31 +69,13 @@ for schema in "${schemas[@]}"; do
     if [ "$newestCommitDate" \> "$maxDate" ]; then
       maxDate=$newestCommitDate
     fi
-    datesHash["$schema"]=$maxDate
-    echo $schema changed at $newestCommitDate
-  fi
-done
-
-# construct sed command
-sedCmd=()
-for schema in "${!datesHash[@]}"; do
-  base=$(basename "$schema" .yaml)
-  sedCmd+=("-e s/$base\/WORK-IN-PROGRESS/$base\/${datesHash[$schema]}/g")
-done
-
-# create the date-stamped schemas
-for schema in "${!datesHash[@]}"; do
-  base=$(basename "$schema" .yaml)
-  target=deploy/oas/$version/$base/${datesHash[$schema]}
 
-  mkdir -p "deploy/oas/$version/$base"
+    base=$(basename $schema '.yaml')
+    # Add the replacement for this schema's placeholder to list of sed commands.
+    sedCmds+=("s/${base}\/WORK-IN-PROGRESS/${base}\/${maxDate}/g")
 
-  sed ${sedCmd[@]} $schemaDir/$schema > $target.yaml
-  node scripts/yaml2json/yaml2json.js $target.yaml
-  rm $target.yaml
-  mv $target.json $target
-
-  mv deploy/oas/$version/$base/*.md $target.md
+    publish_schema "$schema" "$maxDate" $(printf '%s;' "${sedCmds[@]}")
+  fi
 done
 
 echo === Built