Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/release-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
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/solana
- status-success=buildkite/agave
- 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 solanalabs/solana:"$CHANNEL_OR_TAG" .
docker build -t anzaxyz/agave:"$CHANNEL_OR_TAG" .

maybeEcho=
if [[ -z $CI ]]; then
Expand All @@ -43,4 +43,4 @@ else
fi
)
fi
$maybeEcho docker push solanalabs/solana:"$CHANNEL_OR_TAG"
$maybeEcho docker push anzaxyz/agave:"$CHANNEL_OR_TAG"