From 8f17ce7c305acab64c5c4969fe3b4260082574ba Mon Sep 17 00:00:00 2001
From: Yihau Chen <a122092487@gmail.com>
Date: Tue, 13 Feb 2024 00:00:58 +0800
Subject: [PATCH] [anza migration] ci: fix path (#8)

* ci: fix windows build

* ci: publish sdk docker image with the new name

* update automerge status
---
 .github/workflows/release-artifacts.yml | 4 ++--
 .mergify.yml                            | 2 +-
 sdk/docker-solana/build.sh              | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml
index 14760837ba0dbd..a77fd672d8b4b6 100644
--- a/.github/workflows/release-artifacts.yml
+++ b/.github/workflows/release-artifacts.yml
@@ -79,7 +79,7 @@ jobs:
           name: windows-artifact
           path: windows-release/
 
-  windows-s3-upload:
+  windows-gcs-upload:
     if: ${{ needs.windows-build.outputs.channel != '' || needs.windows-build.outputs.tag != '' }}
     needs: [windows-build]
     runs-on: ubuntu-20.04
@@ -88,7 +88,7 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: windows-artifact
-          path: .windows-release/
+          path: ./windows-release
 
       - name: Setup crediential
         uses: "google-github-actions/auth@v2"
diff --git a/.mergify.yml b/.mergify.yml
index 166f59a5f365d1..19f9b8f116a78a 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -50,7 +50,7 @@ pull_request_rules:
   - name: automatic merge (squash) on CI success
     conditions:
       - and:
-        - status-success=buildkite/solana
+        - status-success=buildkite/agave
         - status-success=ci-gate
         - label=automerge
         - label!=no-automerge
diff --git a/sdk/docker-solana/build.sh b/sdk/docker-solana/build.sh
index f1c8ee265d6d56..70e3d0d23e44de 100755
--- a/sdk/docker-solana/build.sh
+++ b/sdk/docker-solana/build.sh
@@ -29,7 +29,7 @@ cp -f ../../fetch-spl.sh usr/bin/
   ./fetch-spl.sh
 )
 
-docker build -t solanalabs/solana:"$CHANNEL_OR_TAG" .
+docker build -t anzaxyz/agave:"$CHANNEL_OR_TAG" .
 
 maybeEcho=
 if [[ -z $CI ]]; then
@@ -43,4 +43,4 @@ else
     fi
   )
 fi
-$maybeEcho docker push solanalabs/solana:"$CHANNEL_OR_TAG"
+$maybeEcho docker push anzaxyz/agave:"$CHANNEL_OR_TAG"