packaging: handle JSON schema upload

Signed-off-by: Patrick Stephens <[email protected]>

Author: Patrick Stephens

.github/actions/release-server-sync/action.yaml

@@ -63,7 +63,14 @@ runs:
   - name: Upload to build server
     run: |
       ssh $USERNAME@$HOST mkdir -p /home/$USERNAME/apt
-      rsync --include="*/" --include="*.rpm" --include="*.deb" --exclude="*" -amvz packaging/releases/ $USERNAME@$HOST:/home/$USERNAME/apt
+      rsync --include="*/" \
+        --include="*.rpm" \
+        --include="*.deb" \
+        --include="*.exe" \
+        --include="*.zip" \
+        --include="fluent-bit-schema*.json" \
+        --exclude="*" -amvz \
+        packaging/releases/ $USERNAME@$HOST:/home/$USERNAME/apt
     env:
       HOST: ${{ inputs.server_hostname }}
       USERNAME: ${{ inputs.server_username }}

.github/workflows/call-build-images.yaml

@@ -318,8 +318,8 @@ jobs:
 
       - name: Generate schema
         run: |
-          docker run --rm -t ${{ inputs.registry }}/${{ inputs.image }}:${{ inputs.version }} -J > fluent-bit-schema.json
-          cat fluent-bit-schema.json | jq -M > fluent-bit-schema-pretty.json
+          docker run --rm -t ${{ inputs.registry }}/${{ inputs.image }}:${{ inputs.version }} -J > fluent-bit-schema-${{ inputs.version }}.json
+          cat fluent-bit-schema.json | jq -M > fluent-bit-schema-pretty-${{ inputs.version }}.json
         shell: bash
 
       - name: Upload the schema

.github/workflows/staging-build.yaml

@@ -96,7 +96,7 @@ jobs:
 
       - name: Display structure of downloaded files
         run: |
-          ls -R
+          ls -R artifacts/
         shell: bash
 
       - name: Push schema to S3 bucket

packaging/server/publish-all.sh

@@ -122,4 +122,20 @@ if compgen -G "$SOURCE_DIR/windows/*$VERSION*" > /dev/null; then
     echo "Copying Windows artefacts"
     # shellcheck disable=SC2086
     cp -vf "$SOURCE_DIR"/windows/*$VERSION* /var/www/releases.fluentbit.io/releases/"$MAJOR_VERSION"/
+else
+    echo "Missing Windows builds"
+fi
+
+# Handle the JSON schema by copying in the new versions (if they exist) and then updating the symlinks that point at the latest.
+if compgen -G "$SOURCE_DIR/fluent-bit-schema*.json" > /dev/null; then
+    echo "Updating JSON schema"
+    cp -vf "$SOURCE_DIR"/fluent-bit-schema*.json /var/www/releases.fluentbit.io/releases/"$MAJOR_VERSION/"
+
+    # Simpler than 'ln --relative --target-directory=/var/www/releases.fluentbit.io/releases/"$MAJOR_VERSION"'
+    pushd /var/www/releases.fluentbit.io/releases/"$MAJOR_VERSION"
+        ln -sf "fluent-bit-schema-$VERSION.json" fluent-bit-schema.json
+        ln -sf "fluent-bit-schema-pretty-$VERSION.json" fluent-bit-schema-pretty.json
+    popd
+else
+    echo "Missing JSON schema"
 fi