Skip to content

Commit

Permalink
Update CI name for x1
Browse files Browse the repository at this point in the history
update the repo slug

Update x1-agave-secondary pipeline name

disable gcp uploads

update the github actions
  • Loading branch information
nibty committed Dec 15, 2024
1 parent 9da3356 commit 909eb44
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-artifacts-auto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ concurrency:

jobs:
release-artifacts:
if: github.repository == 'anza-xyz/agave'
if: github.repository == 'FairCrypto/agave-xolana'
uses: ./.github/workflows/release-artifacts.yml
with:
commit: ${{ github.sha }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
uses: "buildkite/[email protected]"
with:
buildkite_api_access_token: ${{ secrets.TRIGGER_BK_BUILD_TOKEN }}
pipeline: "anza/agave-secondary"
pipeline: "x1-agave-secondary"
branch: "${{ github.ref_name }}"
build_env_vars: '{"TRIGGERED_BUILDKITE_TAG": "${{ github.ref_name }}"}'
commit: "HEAD"
Expand Down
8 changes: 4 additions & 4 deletions ci/buildkite-pipeline-in-disk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ EOF

trigger_secondary_step() {
cat >> "$output_file" <<"EOF"
- name: "Trigger Build on solana-secondary"
trigger: "solana-secondary"
- name: "Trigger Build on x1-agave-secondary"
trigger: "x1-agave-secondary"
branches: "!pull/*"
async: true
build:
Expand Down Expand Up @@ -289,7 +289,7 @@ if [[ -n $BUILDKITE_TAG ]]; then
start_pipeline "Tag pipeline for $BUILDKITE_TAG"

annotate --style info --context release-tag \
"https://github.com/anza-xyz/agave/releases/$BUILDKITE_TAG"
"https://github.com/FairCrypto/agave-xolana/releases/$BUILDKITE_TAG"

# Jump directly to the secondary build to publish release artifacts quickly
trigger_secondary_step
Expand All @@ -307,7 +307,7 @@ if [[ $BUILDKITE_BRANCH =~ ^pull ]]; then

# Add helpful link back to the corresponding Github Pull Request
annotate --style info --context pr-backlink \
"Github Pull Request: https://github.com/anza-xyz/agave/$BUILDKITE_BRANCH"
"Github Pull Request: https://github.com/FairCrypto/agave-xolana/$BUILDKITE_BRANCH"

if [[ $GITHUB_USER = "dependabot[bot]" ]]; then
command_step dependabot "ci/dependabot-pr.sh" 5
Expand Down
8 changes: 4 additions & 4 deletions ci/buildkite-pipeline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ EOF

trigger_secondary_step() {
cat >> "$output_file" <<"EOF"
- name: "Trigger Build on agave-secondary"
trigger: "agave-secondary"
- name: "Trigger Build on x1-agave-secondary"
trigger: "x1-agave-secondary"
branches: "!pull/*"
async: true
soft_fail: true
Expand Down Expand Up @@ -359,7 +359,7 @@ if [[ -n $BUILDKITE_TAG ]]; then
start_pipeline "Tag pipeline for $BUILDKITE_TAG"

annotate --style info --context release-tag \
"https://github.com/anza-xyz/agave/releases/$BUILDKITE_TAG"
"https://github.com/FairCrypto/agave-xolana/releases/$BUILDKITE_TAG"

# Jump directly to the secondary build to publish release artifacts quickly
trigger_secondary_step
Expand All @@ -377,7 +377,7 @@ if [[ $BUILDKITE_BRANCH =~ ^pull ]]; then

# Add helpful link back to the corresponding Github Pull Request
annotate --style info --context pr-backlink \
"Github Pull Request: https://github.com/anza-xyz/agave/$BUILDKITE_BRANCH"
"Github Pull Request: https://github.com/FairCrypto/agave-xolana/$BUILDKITE_BRANCH"

if [[ $GITHUB_USER = "dependabot[bot]" ]]; then
command_step dependabot "ci/dependabot-pr.sh" 5
Expand Down
6 changes: 3 additions & 3 deletions ci/buildkite-solana-private.sh
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ EOF

# trigger_secondary_step() {
# cat >> "$output_file" <<"EOF"
# - name: "Trigger Build on solana-secondary"
# trigger: "solana-secondary"
# - name: "Trigger Build on x1-agave-secondary"
# trigger: "x1-agave-secondary"
# branches: "!pull/*"
# async: true
# build:
Expand Down Expand Up @@ -287,7 +287,7 @@ if [[ $BUILDKITE_BRANCH =~ ^pull ]]; then

# Add helpful link back to the corresponding Github Pull Request
annotate --style info --context pr-backlink \
"Github Pull Request: https://github.com/anza-xyz/agave/$BUILDKITE_BRANCH"
"Github Pull Request: https://github.com/FairCrypto/agave-xolana/$BUILDKITE_BRANCH"

if [[ $GITHUB_USER = "dependabot[bot]" ]]; then
command_step dependabot "ci/dependabot-pr.sh" 5
Expand Down
2 changes: 1 addition & 1 deletion ci/channel-info.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ here="$(dirname "$0")"
# shellcheck source=ci/semver_bash/semver.sh
source "$here"/semver_bash/semver.sh

remote=https://github.com/anza-xyz/agave.git
remote=https://github.com/FairCrypto/agave-xolana.git

# Fetch all vX.Y.Z tags
#
Expand Down
2 changes: 1 addition & 1 deletion ci/dependabot-pr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ fi
echo --- "(FAILING) Backpropagating dependabot-triggered Cargo.lock updates"

name="dependabot-buildkite"
api_base="https://api.github.com/repos/anza-xyz/agave/pulls"
api_base="https://api.github.com/repos/FairCrypto/agave-xolana/pulls"
pr_num=$(echo "$BUILDKITE_BRANCH" | grep -Eo '[0-9]+')
branch=$(curl -s "$api_base/$pr_num" | python3 -c 'import json,sys;print(json.load(sys.stdin)["head"]["ref"])')

Expand Down
4 changes: 2 additions & 2 deletions ci/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ if [[ -n $CI ]]; then
esac

if [[ -n $BUILDKITE_TRIGGERED_FROM_BUILD_PIPELINE_SLUG ]]; then
# The solana-secondary pipeline should use the slug of the pipeline that
# The x1-agave-secondary pipeline should use the slug of the pipeline that
# triggered it
export CI_REPO_SLUG=$BUILDKITE_ORGANIZATION_SLUG/$BUILDKITE_TRIGGERED_FROM_BUILD_PIPELINE_SLUG
else
export CI_REPO_SLUG=$BUILDKITE_ORGANIZATION_SLUG/$BUILDKITE_PIPELINE_SLUG
fi
# TRIGGERED_BUILDKITE_TAG is a workaround to propagate BUILDKITE_TAG into
# the solana-secondary pipeline
# the x1-agave-secondary pipeline
if [[ -n $TRIGGERED_BUILDKITE_TAG ]]; then
export CI_TAG=$TRIGGERED_BUILDKITE_TAG
else
Expand Down
2 changes: 1 addition & 1 deletion ci/test-coverage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ else
codecov -t "${CODECOV_TOKEN}"

annotate --style success --context codecov.io \
"CodeCov report: https://codecov.io/github/anza-xyz/agave/commit/${CI_COMMIT:0:9}"
"CodeCov report: https://codecov.io/github/FairCrypto/agave-xolana/commit/${CI_COMMIT:0:9}"
fi
6 changes: 0 additions & 6 deletions ci/upload-ci-artifact.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,4 @@ upload-s3-artifact() {

upload-gcs-artifact() {
echo "--- artifact: $1 to $2"
docker run --rm \
-v "$GCS_RELEASE_BUCKET_WRITER_CREDIENTIAL:/application_default_credentials.json" \
-v "$PWD:/solana" \
-e CLOUDSDK_AUTH_CREDENTIAL_FILE_OVERRIDE=/application_default_credentials.json \
gcr.io/google.com/cloudsdktool/google-cloud-cli:latest \
gcloud storage cp "$1" "$2"
}
2 changes: 1 addition & 1 deletion ci/upload-github-release-asset.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ fi
# Force CI_REPO_SLUG since sometimes
# BUILDKITE_TRIGGERED_FROM_BUILD_PIPELINE_SLUG is not set correctly, causing the
# artifact upload to fail
CI_REPO_SLUG=anza-xyz/agave
CI_REPO_SLUG=FairCrypto/agave-xolana
#if [[ -z $CI_REPO_SLUG ]]; then
# echo Error: CI_REPO_SLUG not defined
# exit 1
Expand Down

0 comments on commit 909eb44

Please sign in to comment.