Merge pull request #108 from TechnologyEnhancedLearning/refactor-logging

Refactor logging

Author: Phil-NHS

.github/workflows/dev.yml

@@ -50,75 +50,6 @@ jobs:
       WASMSTATICCLIENT_APPSETTINGS_PRODUCTION: ${{ secrets.WASMSTATICCLIENT_APPSETTINGS_PRODUCTION }}
       WASMSERVERHOSTCLIENT_APPSETTINGS_PRODUCTION: ${{ secrets.WASMSERVERHOSTCLIENT_APPSETTINGS_PRODUCTION }}
       WASMSERVERHOST_APPSETTINGS_PRODUCTION: ${{ secrets.WASMSERVERHOST_APPSETTINGS_PRODUCTION }}
-      
-
-
-
-
-
-####### qqqq
-          # 0 not exclusively due to no version bump so check output
-          # dry release seems not to error 1 qqqq!
-          # if [ "${STATUS:-0}" -ne 0 ]; then
-            # echo "in if status 0"
-            # if echo "$SEMVER_OUTPUT_RAW" | grep -q "There are no relevant changes"; then
-              # echo "in if no release published"
-              # # No new version, but we can find the current version
-              # echo "No new version required getting current version from git tags"
-              # DEV_SEMVER_VERSION=$(git describe --tags --abbrev=0 2>/dev/null || echo "0.0.0-version-not-found") # last git tag so if multiple bumps in other branches making package version there will be some discrepancy but the purpose is distinguishing them for dev purposes.
-              # echo "DEV_SEMVER_VERSION = $DEV_SEMVER_VERSION"
-              # exit 0   # treat as success code didnt fail there just was no version increment required          
-            # else
-              # echo "in else no release published"
-              # exit $STATUS   # real error → fail pipeline
-            # fi
-          # else
-            # # Get version include prerelease tag
-            # # Dry run returns different text DEV_SEMVER_VERSION=$(echo "$OUTPUT" | grep -oP 'Published release \K[^\s]+')
-            # echo "in else so status was zero for error"
-            # DEV_SEMVER_VERSION=$(echo "$SEMVER_OUTPUT_RAW" | grep -oP 'Dry run: would publish version \K[^\s]+')
-            # echo "DEV_SEMVER_VERSION = $DEV_SEMVER_VERSION"
-            # echo "version change required true"
-            # # Just because weve been handling errors
-            # exit 0
-          # fi
-      
-      
-      # qqqq - name: Run semantic version (None Blocking)
-        # run: |
-          # # If no version is required we can get an error so here we handle it
-          # set +e
-          
-          # SEMVER_OUTPUT_RAW=$(npx semantic-release)
-          # echo "Raw SEMVER_OUTPUT_RAW=$SEMVER_OUTPUT_RAW"
-          
-          # SEMVER_OUTPUT=$(echo "$SEMVER_OUTPUT_RAW" | grep -oP 'Published release \K[^\s]+')
-
-          # # In development, we always package and update the website—even if there’s no version change.
-          # # This ensures the CI process runs consistently and the latest code is deployed.
-          # # It's especially useful when squashing commits, as it guarantees the package is still rebuilt and published.
-          # echo "Packaging and updating the website in development, even without version changes, to ensure consistent CI behavior and updated packages after squashed commits."
-          
-          # STATUS=$?
-          # if [ -z "$SEMVER_OUTPUT" ]; then
-            # SEMVER_OUTPUT=$(echo "$SEMVER_OUTPUT_RAW" | grep -oP 'Found git tag v\K[^\s]+')
-            # # Note: If Semver falls back to using a Git tag, it will pick the most recent one.
-            # # This tag may not belong to the current branch, so the result isn't guaranteed to reflect the latest changes on this branch.
-            # echo "Semver fallback: using latest Git tag, which may not be from the current branch."
-          # fi
-          
-          # if [ -z "$SEMVER_OUTPUT" ]; then
-            # SEMVER_OUTPUT="0.0.0"
-            # echo "No semantic version or tag, defaulting to 0.0.0 $SEMVER_OUTPUT"
-          # fi
-         
-          # # Export the result to the environment
-          # echo "SEMVER_OUTPUT=$SEMVER_OUTPUT" >> $GITHUB_ENV
-          # set -e
-################
-
-
-
 
   # Now we've done due diligence
   # The checks have been allowed to run if the workflow fails so if there a multiple fails we know. 
@@ -174,7 +105,8 @@ jobs:
           set +e
           # Check what's in the output
           GREP_NO_CHANGES=$(echo "$SEMVER_OUTPUT_RAW" | grep -q 'There are no relevant changes' && echo "true" || echo "false")
-          GREP_WOULD_PUBLISH=$(echo "$SEMVER_OUTPUT_RAW" | grep -q 'Dry run: would publish version' && echo "true" || echo "false")
+          # qqqq GREP_WOULD_PUBLISH=$(echo "$SEMVER_OUTPUT_RAW" | grep -q 'Dry run: would publish version' && echo "true" || echo "false")
+          GREP_WOULD_PUBLISH=$(echo "$SEMVER_OUTPUT_RAW" | grep -q 'Published release' && echo "true" || echo "false")
           echo "GREP_NO_CHANGES=$GREP_NO_CHANGES"
           echo "GREP_WOULD_PUBLISH=$GREP_WOULD_PUBLISH"
           set -e
@@ -185,15 +117,16 @@ jobs:
             echo "No relevant changes found - DEV_SEMVER_VERSION=$DEV_SEMVER_VERSION"
             echo "DEV_SEMVER_VERSION=$DEV_SEMVER_VERSION" >> $GITHUB_ENV
           # Check if version bump expected
-          elif echo "$SEMVER_OUTPUT_RAW" | grep -q 'Dry run: would publish version'; then
+          # qqqq elif echo "$SEMVER_OUTPUT_RAW" | grep -q 'Dry run: would publish version'; then
+          elif echo "$SEMVER_OUTPUT_RAW" | grep -q 'Published release'; then
           # Extract the actual version
-            DEV_SEMVER_VERSION=$(echo "$SEMVER_OUTPUT_RAW" | grep -oP 'Dry run: would publish version \K[^\s]+' || echo "extract-failed")
+            DEV_SEMVER_VERSION=$(echo "$SEMVER_OUTPUT_RAW" | grep -oP 'Published release \K[^\s]+' || echo "extract-failed")
             echo "Version change detected - DEV_SEMVER_VERSION=$DEV_SEMVER_VERSION"
             echo "version change required true"
             echo "DEV_SEMVER_VERSION=$DEV_SEMVER_VERSION" >> $GITHUB_ENV
             # Fallback
           else
-            echo " ⚠️ Neither 'no changes' nor 'would publish' found. (using fallback)."
+            echo " ⚠️ Neither 'no changes' nor 'publish version' found. (using fallback)."
             DEV_SEMVER_VERSION="$FALLBACK_VERSION"
             echo "DEV_SEMVER_VERSION=$DEV_SEMVER_VERSION"
             echo "DEV_SEMVER_VERSION=$DEV_SEMVER_VERSION" >> $GITHUB_ENV

.github/workflows/release.yml

@@ -69,7 +69,6 @@ jobs:
             SEMVER_CHANGED=false
             echo "Changes do not warrant a version change. gh_pages and packages won't be updated."
             echo "semantic-version-change-required=$SEMVER_CHANGED" >> $GITHUB_OUTPUT
-            echo "Changes do not warrant a version change. gh_pages and packages won't be updated."
           # Check if version bump expected
           elif echo "$SEMVER_OUTPUT_RAW" | grep -q 'Published release'; then
             # Extract the actual version, if it fails here we want to know