Should fix set version

set-version/action.yaml

@@ -10,10 +10,6 @@ inputs:
     description: "Separator between version and suffix (either '.' or '-')"
     required: false
     default: "-"
-  target:
-    description: "Project type (e.g. dotnet, npm)"
-    required: false
-    default: ""
 
 runs:
   using: "composite"
@@ -27,117 +23,66 @@ runs:
       shell: bash
       run: |
         git fetch --tags
-    - name: Prepare variables
+
-      id: prepare
+    - name: Calculate Version
+      id: calculate
       shell: bash
       run: |
+        DATE_LEADING=$(date +'%Y.%m.%d')
+
         YEAR=$(date +'%Y')
-        MONTH=$(date +%-m)
+        MONTH_NL=$(date +%-m)
-        DAY=$(date +%-d)
+        DAY_NL=$(date +%-d)
+
+        TAG_COUNT=$(git tag -l "${DATE_LEADING}.*" | wc -l)
+        BUILD_NUMBER="${TAG_COUNT}"  # 0 on first build, 1 on second, etc.
+
         VERSION_SUFFIX="${{ inputs.version_suffix }}"
         SUFFIX_SEPARATOR="${{ inputs.suffix_separator }}"
 
-        # Count tags for day and month prefixes to support different targets
+        # Regular (keeps leading zeros in date)
-        TAG_COUNT_DAY=$(git tag -l "${YEAR}.${MONTH}.${DAY}.*" | wc -l)
-        TAG_COUNT_MONTH=$(git tag -l "${YEAR}.${MONTH}.*" | wc -l)
-
-        echo "year=$YEAR" >> $GITHUB_OUTPUT
-        echo "month=$MONTH" >> $GITHUB_OUTPUT
-        echo "day=$DAY" >> $GITHUB_OUTPUT
-        echo "version_suffix=$VERSION_SUFFIX" >> $GITHUB_OUTPUT
-        echo "suffix_separator=$SUFFIX_SEPARATOR" >> $GITHUB_OUTPUT
-        echo "tag_count_day=$TAG_COUNT_DAY" >> $GITHUB_OUTPUT
-        echo "tag_count_month=$TAG_COUNT_MONTH" >> $GITHUB_OUTPUT
-
-    - name: Calculate Version (dotnet)
-      id: calc_dotnet
-      if: ${{ inputs.target == 'dotnet' }}
-      shell: bash
-      run: |
-        YEAR=${{ steps.prepare.outputs.year }}
-        MONTH=${{ steps.prepare.outputs.month }}
-        DAY=${{ steps.prepare.outputs.day }}
-        VERSION_SUFFIX=${{ steps.prepare.outputs.version_suffix }}
-        SUFFIX_SEPARATOR=${{ steps.prepare.outputs.suffix_separator }}
-        TAG_COUNT=${{ steps.prepare.outputs.tag_count_day }}
-
-        if [ "$TAG_COUNT" -eq 0 ]; then
-          BUILD_NUMBER=0
-        else
-          BUILD_NUMBER=$(($TAG_COUNT + 1))
-        fi
-
         if [ -n "$VERSION_SUFFIX" ]; then
-          BUILD_VERSION="${YEAR}.${MONTH}.${DAY}.${BUILD_NUMBER}${SUFFIX_SEPARATOR}${VERSION_SUFFIX}"
+          BUILD_VERSION="${DATE_LEADING}.${BUILD_NUMBER}${SUFFIX_SEPARATOR}${VERSION_SUFFIX}"
         else
-          BUILD_VERSION="${YEAR}.${MONTH}.${DAY}.${BUILD_NUMBER}"
+          BUILD_VERSION="${DATE_LEADING}.${BUILD_NUMBER}"
         fi
 
-        echo "build_version=$BUILD_VERSION" >> $GITHUB_OUTPUT
+        # Dotnet variant: no leading zeros for month/day, omit build segment when 0
-
+        DOTNET_DATE="${YEAR}.${MONTH_NL}.${DAY_NL}"
-    - name: Calculate Version (angular)
+        if [ "${BUILD_NUMBER}" -eq 0 ]; then
-      id: calc_angular
-      if: ${{ inputs.target == 'angular' }}
-      shell: bash
-      run: |
-        YEAR=${{ steps.prepare.outputs.year }}
-        MONTH=${{ steps.prepare.outputs.month }}
-        DAY=${{ steps.prepare.outputs.day }}
-        VERSION_SUFFIX=${{ steps.prepare.outputs.version_suffix }}
-        SUFFIX_SEPARATOR=${{ steps.prepare.outputs.suffix_separator }}
-        TAG_COUNT=${{ steps.prepare.outputs.tag_count_month }}
-
-        if [ "$TAG_COUNT" -eq 0 ]; then
-          BUILD_NUMBER=0
-        else
-          BUILD_NUMBER=$(($TAG_COUNT + 1))
-        fi
-
-        LAST_PART="${DAY}${BUILD_NUMBER}"
           if [ -n "$VERSION_SUFFIX" ]; then
-          BUILD_VERSION="${YEAR}.${MONTH}.${LAST_PART}${SUFFIX_SEPARATOR}${VERSION_SUFFIX}"
+            DOTNET_VERSION="${DOTNET_DATE}${SUFFIX_SEPARATOR}${VERSION_SUFFIX}"
           else
-          BUILD_VERSION="${YEAR}.${MONTH}.${LAST_PART}"
+            DOTNET_VERSION="${DOTNET_DATE}"
           fi
-
-        echo "build_version=$BUILD_VERSION" >> $GITHUB_OUTPUT
-
-    - name: Calculate Version (default)
-      id: calc_default
-      if: ${{ inputs.target != 'dotnet' && inputs.target != 'angular' }}
-      shell: bash
-      run: |
-        YEAR=${{ steps.prepare.outputs.year }}
-        MONTH=${{ steps.prepare.outputs.month }}
-        DAY=${{ steps.prepare.outputs.day }}
-        VERSION_SUFFIX=${{ steps.prepare.outputs.version_suffix }}
-        SUFFIX_SEPARATOR=${{ steps.prepare.outputs.suffix_separator }}
-        TAG_COUNT=${{ steps.prepare.outputs.tag_count_day }}
-
-        if [ "$TAG_COUNT" -eq 0 ]; then
-          BUILD_NUMBER=0
         else
-          BUILD_NUMBER=$(($TAG_COUNT + 1))
-        fi
-
           if [ -n "$VERSION_SUFFIX" ]; then
-          BUILD_VERSION="${YEAR}.${MONTH}.${DAY}.${BUILD_NUMBER}${SUFFIX_SEPARATOR}${VERSION_SUFFIX}"
+            DOTNET_VERSION="${DOTNET_DATE}.${BUILD_NUMBER}${SUFFIX_SEPARATOR}${VERSION_SUFFIX}"
           else
-          BUILD_VERSION="${YEAR}.${MONTH}.${DAY}.${BUILD_NUMBER}"
+            DOTNET_VERSION="${DOTNET_DATE}.${BUILD_NUMBER}"
+          fi
         fi
 
-        echo "build_version=$BUILD_VERSION" >> $GITHUB_OUTPUT
+        # NPM variant: year.month.(DDbb) where DD=day zero-padded to 2, bb=build zero-padded to 2
-
+        DAY_PAD=$(printf '%02d' "${DAY_NL}")
-    - name: Publish Version
+        BUILD_PAD=$(printf '%02d' "${BUILD_NUMBER}")
-      shell: bash
+        NPM_DAY_BUILD="${DAY_PAD}${BUILD_PAD}"
-      run: |
+        if [ -n "$VERSION_SUFFIX" ]; then
-        BUILD_VERSION="${{ steps.calc_dotnet.outputs.build_version }}"
+          NPM_VERSION="${YEAR}.${MONTH_NL}.${NPM_DAY_BUILD}${SUFFIX_SEPARATOR}${VERSION_SUFFIX}"
-        if [ -z "$BUILD_VERSION" ]; then BUILD_VERSION="${{ steps.calc_angular.outputs.build_version }}"; fi
+        else
-        if [ -z "$BUILD_VERSION" ]; then BUILD_VERSION="${{ steps.calc_default.outputs.build_version }}"; fi
+          NPM_VERSION="${YEAR}.${MONTH_NL}.${NPM_DAY_BUILD}"
+        fi
 
         echo "$BUILD_VERSION" > version.txt
+        echo "$BUILD_VERSION" > version
+        echo "$DOTNET_VERSION" > dotnet-version.txt
+        echo "$DOTNET_VERSION" > dotnet-version
+        echo "$NPM_VERSION" > npm-version.txt
+        echo "$NPM_VERSION" > npm-version
+
         echo "VERSION=$BUILD_VERSION" >> $GITHUB_ENV
-        echo "Generated version: $BUILD_VERSION"
+        echo "DOTNET_VERSION=$DOTNET_VERSION" >> $GITHUB_ENV
+        echo "NPM_VERSION=$NPM_VERSION" >> $GITHUB_ENV
 
     - name: Create Git Tag
       shell: bash
@@ -153,3 +98,15 @@ runs:
       with:
         name: version
         path: version.txt
+
+    - name: Upload Dotnet Version Artifact
+      uses: https://github.com/actions/upload-artifact@v3
+      with:
+        name: dotnet-version
+        path: dotnet-version.txt
+
+    - name: Upload NPM Version Artifact
+      uses: https://github.com/actions/upload-artifact@v3
+      with:
+        name: npm-version
+        path: npm-version.txt