From 93ef2e1a624395fa0f49690ebfa94cd2f4950564 Mon Sep 17 00:00:00 2001
From: alwaysmesmerizingyou <alwaysmesmerizingyou@gmail.com>
Date: Fri, 14 Aug 2026 14:42:42 -0700
Subject: [PATCH] fix PowerShell compatibility and make git push non-fatal

---
 .gitlab-ci.yml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cec9c89..dacdda8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,8 +51,12 @@ build:
     - |
       $repos = @("frontend", "player", "stream-api", "auth-proxy")
       $last = @{}
+      
       if (Test-Path "last-shas.json") {
-        $last = Get-Content last-shas.json | ConvertFrom-Json -AsHashtable
+        $rawJson = Get-Content "last-shas.json" -Raw | ConvertFrom-Json
+        if ($rawJson) {
+          $rawJson.psobject.properties | ForEach-Object { $last[$_.Name] = $_.Value }
+        }
       }
 
       $current = @{}
@@ -96,15 +100,19 @@ build:
       echo "CHANGED=true" >> build.env
 
     - |
-      git config user.name "gitlab-ci[bot]"
-      git config user.email "gitlab-ci[bot]@gitlab.com"
-      git add last-shas.json
-      
-      $gitStatus = git status --porcelain
-      if ($gitStatus) {
-        git remote set-url origin "https://oauth2:$env:GITLAB_TOKEN@gitlab.com/$env:CI_PROJECT_PATH.git"
-        git commit -m "chore: update last-known repo SHAs [skip ci]"
-        git push origin "HEAD:$env:CI_COMMIT_BRANCH"
+      try {
+        git config user.name "gitlab-ci[bot]"
+        git config user.email "gitlab-ci[bot]@gitlab.com"
+        git add last-shas.json
+        
+        $gitStatus = git status --porcelain
+        if ($gitStatus) {
+          git remote set-url origin "https://oauth2:$env:GITLAB_TOKEN@gitlab.com/$env:CI_PROJECT_PATH.git"
+          git commit -m "chore: update last-known repo SHAs [skip ci]"
+          git push origin "HEAD:$env:CI_COMMIT_BRANCH"
+        }
+      } catch {
+        Write-Warning "Could not push last-shas.json back to git repository. Proceeding with build..."
       }
 
     - Write-Host "Starting secure build process..."