Skip to content

Commit

Permalink
Revert "[anza migration] ci: fix path (anza-xyz#8)"
Browse files Browse the repository at this point in the history
This reverts commit 58e9a19.
  • Loading branch information
willhickey committed Mar 5, 2024
1 parent e72f6ba commit 4cb7c31
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions sdk/docker-solana/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -43,4 +43,4 @@ else
fi
)
fi
$maybeEcho docker push anzaxyz/agave:"$CHANNEL_OR_TAG"
$maybeEcho docker push solanalabs/solana:"$CHANNEL_OR_TAG"

0 comments on commit 4cb7c31

Please sign in to comment.