evomedia/zscripts-token-savers
1
0
Fork 0
mirror of https://github.com/kellymichels/zscripts-token-savers synced 2026-10-07 07:18:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(zdeploy): stamp every deploy path, so -Scan can see edge, static and docker projects

Browse Source 
Three of the six deploy paths - edge, static and docker - never wrote
.last_deploy_utc, so projects on those paths read no-stamp after every deploy
and the scan's remedy for that state did nothing when followed.
Get-RecordDeployBash now takes the zip name optionally (those paths upload no
zip) and each of the three stamps right before its Done line.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
KellyMichels 2026-09-02 16:44:46 -05:00
parent bd45848dea
commit 5371b796fe
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zdeploy.ps1
View File

@ -349,7 +349,9 @@ function Get-RecordDeployBash {
param( param(
[Parameter(Mandatory)]$Proj, [Parameter(Mandatory)]$Proj,
[Parameter(Mandatory)][string]$RemotePath, [Parameter(Mandatory)][string]$RemotePath,
[Parameter(Mandatory)][string]$ZipName # Optional: the edge, static and docker paths upload no zip, so there
# is nothing to remove - but they still ship, so they still stamp.
[string]$ZipName = ''
) )
$sha = '' $sha = ''
$root = $Proj.localRoot $root = $Proj.localRoot
@ -363,7 +365,8 @@ function Get-RecordDeployBash {
$cmd = "date -u +'%Y-%m-%d %H:%M:%S UTC' | sudo tee $RemotePath/.last_deploy_utc > /dev/null" $cmd = "date -u +'%Y-%m-%d %H:%M:%S UTC' | sudo tee $RemotePath/.last_deploy_utc > /dev/null"
# 40 hex characters, so it needs no quoting in the remote command. # 40 hex characters, so it needs no quoting in the remote command.
if ($sha) { $cmd += " && printf '%s' $sha | sudo tee $RemotePath/.last_deploy_sha > /dev/null" } if ($sha) { $cmd += " && printf '%s' $sha | sudo tee $RemotePath/.last_deploy_sha > /dev/null" }
return "$cmd && rm -f $RemoteHome/$ZipName" if ($ZipName) { $cmd += " && rm -f $RemoteHome/$ZipName" }
return $cmd
} }
function Get-DeployZipName { function Get-DeployZipName {
@ -1151,6 +1154,7 @@ function Invoke-EdgeDeploy {
Invoke-Ec2Step "edge nginx reload" "sudo docker exec $pc nginx -s reload || true" Invoke-Ec2Step "edge nginx reload" "sudo docker exec $pc nginx -s reload || true"
} }
Invoke-Ec2Step "fix nginx-logs permissions (if present)" "if [ -d $remotePath/nginx-logs ]; then sudo chmod 777 $remotePath/nginx-logs; sudo chmod 666 $remotePath/nginx-logs/*.log 2>/dev/null || true; fi" Invoke-Ec2Step "fix nginx-logs permissions (if present)" "if [ -d $remotePath/nginx-logs ]; then sudo chmod 777 $remotePath/nginx-logs; sudo chmod 666 $remotePath/nginx-logs/*.log 2>/dev/null || true; fi"
Invoke-Ec2Step "record deploy stamp" (Get-RecordDeployBash -Proj $Proj -RemotePath $remotePath)
Write-Host "--- [Done] Edge proxy deploy finished ---" -ForegroundColor Green Write-Host "--- [Done] Edge proxy deploy finished ---" -ForegroundColor Green
} }
@ -1188,6 +1192,7 @@ function Invoke-StaticDeploy {
Invoke-Ec2Step "swap in $($d.Name)" "rm -rf $remotePath/$($d.Name) && mv $remotePath/.staging-$($d.Name) $remotePath/$($d.Name)" Invoke-Ec2Step "swap in $($d.Name)" "rm -rf $remotePath/$($d.Name) && mv $remotePath/.staging-$($d.Name) $remotePath/$($d.Name)"
} }
Invoke-Ec2Step "record deploy stamp" (Get-RecordDeployBash -Proj $Proj -RemotePath $remotePath)
Write-Host "--- [Done] Static site deploy finished ---" -ForegroundColor Green Write-Host "--- [Done] Static site deploy finished ---" -ForegroundColor Green
} }
@ -1239,6 +1244,7 @@ function Invoke-DockerDeploy {
Invoke-Ec2Step "docker compose up -d" "cd $remotePath && sudo docker compose up -d" Invoke-Ec2Step "docker compose up -d" "cd $remotePath && sudo docker compose up -d"
Invoke-Ec2PostDeployCleanup -Label $Key Invoke-Ec2PostDeployCleanup -Label $Key
Invoke-Ec2Step "record deploy stamp" (Get-RecordDeployBash -Proj $Proj -RemotePath $remotePath)
Write-Host "`n--- [Done] $($Proj.label) deploy finished ---" -ForegroundColor Green Write-Host "`n--- [Done] $($Proj.label) deploy finished ---" -ForegroundColor Green
Write-DeployLocation -Proj $Proj Write-DeployLocation -Proj $Proj
} }