Skip to content

Commit 62095f1

Browse files
willhickeywen-coding
authored andcommitted
Revert "[anza migration] ci: fix path (solana-labs#8)"
This reverts commit 58e9a19.
1 parent e3a6fca commit 62095f1

File tree

3 files changed

+9
-15
lines changed

3 files changed

+9
-15
lines changed

.github/workflows/publish-windows-tarball.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
name: windows-artifact
7474
path: windows-release/
7575

76-
windows-gcs-upload:
76+
windows-s3-upload:
7777
if: ${{ needs.windows-build.outputs.channel != '' || needs.windows-build.outputs.tag != '' }}
7878
needs: [windows-build]
7979
runs-on: ubuntu-22.04
@@ -82,7 +82,7 @@ jobs:
8282
uses: actions/download-artifact@v4
8383
with:
8484
name: windows-artifact
85-
path: ./windows-release
85+
path: .windows-release/
8686

8787
- name: Setup crediential
8888
uses: "google-github-actions/auth@v2"

.mergify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ pull_request_rules:
5050
- name: automatic merge (squash) on CI success
5151
conditions:
5252
- and:
53-
- status-success=buildkite/agave
53+
- status-success=buildkite/solana
5454
- status-success=ci-gate
5555
- label=automerge
5656
- label!=no-automerge

docker-solana/build.sh

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
#!/usr/bin/env bash
22
set -ex
33

4-
cd "$(dirname "$0")"/..
4+
cd "$(dirname "$0")"/../..
55
eval "$(ci/channel-info.sh)"
66
source ci/rust-version.sh
7-
source ci/docker/env.sh
87

98
CHANNEL_OR_TAG=
109
if [[ -n "$CI_TAG" ]]; then
@@ -21,21 +20,16 @@ fi
2120

2221
cd "$(dirname "$0")"
2322
rm -rf usr/
24-
../ci/docker-run-default-image.sh scripts/cargo-install-all.sh docker-solana/usr
23+
../../ci/docker-run-default-image.sh scripts/cargo-install-all.sh sdk/docker-solana/usr
2524

26-
cp -f ../scripts/run.sh usr/bin/solana-run.sh
27-
cp -f ../fetch-core-bpf.sh usr/bin/
28-
cp -f ../fetch-spl.sh usr/bin/
29-
cp -f ../fetch-programs.sh usr/bin/
25+
cp -f ../../scripts/run.sh usr/bin/solana-run.sh
26+
cp -f ../../fetch-spl.sh usr/bin/
3027
(
3128
cd usr/bin
32-
./fetch-core-bpf.sh
3329
./fetch-spl.sh
3430
)
3531

36-
docker build \
37-
--build-arg "BASE_IMAGE=${CI_DOCKER_ARG_BASE_IMAGE}" \
38-
-t anzaxyz/agave:"$CHANNEL_OR_TAG" .
32+
docker build -t solanalabs/solana:"$CHANNEL_OR_TAG" .
3933

4034
maybeEcho=
4135
if [[ -z $CI ]]; then
@@ -49,4 +43,4 @@ else
4943
fi
5044
)
5145
fi
52-
$maybeEcho docker push anzaxyz/agave:"$CHANNEL_OR_TAG"
46+
$maybeEcho docker push solanalabs/solana:"$CHANNEL_OR_TAG"

0 commit comments

Comments
 (0)