Merge pull request #30 from TechnologyEnhancedLearning/feat-graceful-chore-first

chore(test): cake

Author: Phil-NHS

.github/workflows/dev.yml

@@ -154,7 +154,7 @@ jobs:
           if [ -z "$SEMVER_OUTPUT" ]; then
             SEMVER_OUTPUT=$(echo "$SEMVER_OUTPUT_RAW" | grep -oP 'Found git tag v\K[^\s]+')
           fi
-          
+          echo "if using git tag it will just be last made so not guaranteed to be the same branch but ok for now"
           # Export the result to the environment
           echo "SEMVER_OUTPUT=$SEMVER_OUTPUT" >> $GITHUB_ENV
           set -e
@@ -168,9 +168,9 @@ jobs:
           timestamp=$(date +"%y%m%d-%H%M")
           echo "Timestamp $timestamp"
           
-          echo "shouldnt timestamp but ok for now qqqq"
-          echo "if you get a tag like 1.1.1-timestamp or :-nonversion-triggering-change it just means there was a chore before "
-          full_version="${SEMVER_OUTPUT:-nonversion-triggering-change}-${timestamp}"
+          echo "shouldnt timestamp but ok for now"
+          echo "If it is nonversion triggering change and the first on the branch will get the release version because it is the most recent tag"
+          full_version="${SEMVER_OUTPUT}-${timestamp}"
           echo "extracted version $full_version"
           echo "dev-semantic-version=$full_version" >> $GITHUB_OUTPUT
 

.github/workflows/release.yml

@@ -65,37 +65,15 @@ jobs:
         env:
           github_token: ${{ secrets.github_token }}
         run: |
+          set +e
           SEMVER_VERSION=$(npx semantic-release | grep -oP 'Published release \K[\d.]+')
           echo "semantic-release-version=$SEMVER_VERSION" >> $GITHUB_OUTPUT
           
           # Check if SEMVER_VERSION is empty and echo the message if so
           if [ -z "$SEMVER_VERSION" ]; then
             echo "Changes do not warrant a version change. gh_pages and packages won't be updated."
           fi
-      # qqqq are we versioning the whole repo not just the branch???
-      # - name: Run Semantic Version (None Blocking)
-        # env:
-          # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # PACKAGES_TOKEN: ${{ secrets.PACKAGES_TOKEN }}
-        # run: |
-          # 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 dev even if there is no version change we will package and update the website, this means it will for ci which isnt necessary
-          # # but also if we squash a load of commits we will still get the package updated
-          # echo "In dev even if there is no version change we will package and update the website, this means it will for ci which isnt necessary  but also if we squash a load of commits we will still get the package updated"
-          
-          # STATUS=$?
-          # if [ -z "$SEMVER_OUTPUT" ]; then
-            # SEMVER_OUTPUT=$(echo "$SEMVER_OUTPUT_RAW" | grep -oP 'Found git tag v\K[^\s]+')
-          # fi
-          
-          # # Export the result to the environment
-          # echo "SEMVER_OUTPUT=$SEMVER_OUTPUT" >> $GITHUB_ENV
-          # set -e
+          set -e
     
 
   build-bcl-package-and-publish:

Package.BlazorComponentLibrary/Components/SimpleCounter.razor

@@ -1,7 +1,7 @@
 <h3>Simple Counter</h3>
 Feat123
 <button class="btn btn-primary" @onclick="IncrementCount">
-   A Build aa(@currentCount)
+   A Build aaa(@currentCount)
 </button>
 
 @code {