diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 71f9891..1ec9e9c 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -21,7 +21,7 @@ jobs: - name: Push to registry run: | - nix shell nixpkgs#skopeo -c skopeo copy \ + skopeo copy \ --dest-creds "${{ secrets.REGISTRY_USERNAME }}:${{ secrets.REGISTRY_PASSWORD }}" \ --insecure-policy \ docker-archive:result \ @@ -32,16 +32,26 @@ jobs: NOMAD_ADDR: ${{ secrets.NOMAD_ADDR }} run: | # Force re-evaluation (uuid changes on each job run) - curl -sS -X POST "$NOMAD_ADDR/v1/job/animaltrack/evaluate" + echo "Triggering evaluation at $NOMAD_ADDR" + curl -sS -X POST "$NOMAD_ADDR/v1/job/animaltrack/evaluate" > /dev/null - # Wait for deployment + # Wait for deployment to be created sleep 5 - DEPLOY_ID=$(curl -sS "$NOMAD_ADDR/v1/job/animaltrack/deployments" | \ - nix shell nixpkgs#jq -c jq -r '.[0].ID') + + echo "Fetching deployments..." + DEPLOYMENTS=$(curl -sS "$NOMAD_ADDR/v1/job/animaltrack/deployments") + echo "Response: $DEPLOYMENTS" + + DEPLOY_ID=$(echo "$DEPLOYMENTS" | jq -r '.[0].ID') + echo "Deployment ID: $DEPLOY_ID" + + if [ "$DEPLOY_ID" = "null" ] || [ -z "$DEPLOY_ID" ]; then + echo "No deployment found, job may not have update stanza" + exit 0 + fi for i in $(seq 1 30); do - STATUS=$(curl -sS "$NOMAD_ADDR/v1/deployment/$DEPLOY_ID" | \ - nix shell nixpkgs#jq -c jq -r '.Status') + STATUS=$(curl -sS "$NOMAD_ADDR/v1/deployment/$DEPLOY_ID" | jq -r '.Status') echo "Deployment status: $STATUS" case $STATUS in successful) exit 0 ;;