Fixed for full on deploy

Author: tluijken

.github/actions/docker/action.yml

@@ -94,20 +94,7 @@ runs:
         echo "Branch name: $BRANCH_NAME"
         echo "Release version: $VERSION"
 
-        if [[ $INPUT_TAG != '' ]]; then
-          TAG="${IMAGE_NAME}:${INPUT_TAG}"
-        elif [[ "$BRANCH_NAME" == "main" ]]; then
-          if [[ $VERSION == '' ]]; then
-              printf '%s\n' "Test case x failed" >&2
-              exit 1
-          fi
-          TAG="${IMAGE_NAME}:${VERSION}"
-        elif [[ "$BRANCH_NAME" == "develop" ]] || [[ "$BRANCH_NAME" == release-* ]] || [[ "$BRANCH_NAME" == hotfix-* ]]; then
-          TAG="${IMAGE_NAME}:${BRANCH_NAME}-${DATE}"
-        else
-          TAG="${IMAGE_NAME}:${BRANCH_NAME}"
-        fi
-
+        TAG="${IMAGE_NAME}:${BRANCH_NAME}-${DATE}"
         echo "tag=${TAG}" >> $GITHUB_OUTPUT
 
     - name: Docker build image

.github/workflows/BUILD_AND_DEPLOY.yml

@@ -14,11 +14,92 @@ jobs:
       - uses: actions/checkout@v6
         name: Checkout
 
-      - name: Get project version from build.gradle.kts
-        id: get_version
+      - name: Set up Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+
+      - name: Download libraries dist artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ inputs.frontend_libraries_build_artifact_name }}
+          path: frontend/dist/
+
+      - name: Move local devDependencies to dependencies and install
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          PROJECTS_DIR="projects/valtimo"
+          SCOPE="@valtimo"
+          LOCAL_ROOT="dist/valtimo"
+          PKG_JSON="package.json"
+
+          if [ ! -f "$PKG_JSON" ]; then
+            echo "❌ $PKG_JSON niet gevonden in repo-root"; exit 1
+          fi
+          if [ ! -d "$PROJECTS_DIR" ]; then
+            echo "ℹ️  '$PROJECTS_DIR' niet gevonden; niets te doen."; exit 0
+          fi
+
+          echo "🔎 Subfolders in '$PROJECTS_DIR' verzamelen…"
+          mapfile -t NAMES < <(find "$PROJECTS_DIR" -mindepth 1 -maxdepth 1 -type d -printf '%f\n' | grep -v '^\.' || true)
+
+          if [ "${#NAMES[@]}" -eq 0 ]; then
+            echo "ℹ️  Geen subfolders gevonden; niets te doen."; exit 0
+          fi
+
+          for name in "${NAMES[@]}"; do
+            npm pkg delete devDependencies."$SCOPE/$name" || true
+            npm pkg set dependencies.@valtimo/$name="file:$LOCAL_ROOT/$name"
+          done
+
+          echo "📦 npm install…"
+          npm install
+
+          echo "🎉 Klaar. Geüpdatet packages:"
+          for name in "${NAMES[@]}"; do
+            echo " - ${SCOPE}/${name} -> file:${LOCAL_ROOT}/${name}"
+          done
+
+          echo "Content of package.json:"
+          cat package.json
+
+          sed -i "s/\"dist\/valtimo/\"dist\/valtimo/g" angular.json
+
+      - name: Build app (optioneel voor andere outputs)
+        run: npm run build
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Resolve frontend tree hash
+        id: frontend_tree
+        run: echo "tree=$(git rev-parse HEAD:frontend)" >> "$GITHUB_OUTPUT"
+
+      - name: Generate image tags
+        id: generate_tags
+        uses: docker/metadata-action@v5
+        env:
+          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+        with:
+          images: ghcr.io/${{ github.repository }}/gzac-frontend
+          tags: |
+            type=raw,value=${{ env.BRANCH_NAME }}-test.${{ github.run_number }}
+            type=raw,value=commit-test-${{ github.sha }}
+            type=raw,value=contents-test-${{ steps.frontend_tree.outputs.tree }}
+          flavor: |
+            latest=false
+
+      - name: Extract primary image tag
+        id: primary_tag
         run: |
-          version=$(awk -F= '/^projectVersion/ {gsub(/^[ \t]+|[ \t]+$/, "", $2); print $2; exit}' gradle.properties)
-          echo "version=$version" >> $GITHUB_OUTPUT
+          full_tag='${{ fromJson(steps.generate_tags.outputs.json).tags[0] }}'
+          echo "tag=${full_tag##*:}" >> "$GITHUB_OUTPUT"
 
       - uses: ./.github/actions/docker
         name: Build and push to Azure Container Registry
@@ -31,4 +112,4 @@ jobs:
           registry: "commongroundacr.azurecr.io"
           push: ${{ github.event_name != 'pull_request' }}
           vulnerability_scan: false
-          version: ${{ steps.get_version.outputs.version }}
+          version: ${{ steps.primary_tag.outputs.full_tag }}