From 4cb7c315b8ca0b35e1e5c19ba9d101f5b9b07535 Mon Sep 17 00:00:00 2001
From: Will Hickey <will.hickey@anza.xyz>
Date: Tue, 5 Mar 2024 10:19:20 -0600
Subject: [PATCH] Revert "[anza migration] ci: fix path (#8)"

This reverts commit 58e9a19f11822c93fdece4567d5250cd0b671ad1.
---
 .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 79fa59636c7f7d..9b2d1965a7dc01 100644
--- a/.github/workflows/release-artifacts.yml
+++ b/.github/workflows/release-artifacts.yml
@@ -70,7 +70,7 @@ jobs:
           name: windows-artifact
           path: windows-release/
 
-  windows-gcs-upload:
+  windows-s3-upload:
     if: ${{ needs.windows-build.outputs.channel != '' || needs.windows-build.outputs.tag != '' }}
     needs: [windows-build]
     runs-on: ubuntu-20.04
@@ -79,7 +79,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 19f9b8f116a78a..166f59a5f365d1 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/agave
+        - status-success=buildkite/solana
         - status-success=ci-gate
         - label=automerge
         - label!=no-automerge
diff --git a/sdk/docker-solana/build.sh b/sdk/docker-solana/build.sh
index 70e3d0d23e44de..f1c8ee265d6d56 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 anzaxyz/agave:"$CHANNEL_OR_TAG" .
+docker build -t solanalabs/solana:"$CHANNEL_OR_TAG" .
 
 maybeEcho=
 if [[ -z $CI ]]; then
@@ -43,4 +43,4 @@ else
     fi
   )
 fi
-$maybeEcho docker push anzaxyz/agave:"$CHANNEL_OR_TAG"
+$maybeEcho docker push solanalabs/solana:"$CHANNEL_OR_TAG"