From 909eb44c0478f66ceb602239210d83b2b7ac8d68 Mon Sep 17 00:00:00 2001
From: Nicholas Pettas <nick@faircrypto.org>
Date: Fri, 13 Dec 2024 17:33:16 -0800
Subject: [PATCH] Update CI name for x1
update the repo slug
Update x1-agave-secondary pipeline name
disable gcp uploads
update the github actions
---
.github/workflows/release-artifacts-auto.yml | 2 +-
.github/workflows/release.yml | 2 +-
ci/buildkite-pipeline-in-disk.sh | 8 ++++----
ci/buildkite-pipeline.sh | 8 ++++----
ci/buildkite-solana-private.sh | 6 +++---
ci/channel-info.sh | 2 +-
ci/dependabot-pr.sh | 2 +-
ci/env.sh | 4 ++--
ci/test-coverage.sh | 2 +-
ci/upload-ci-artifact.sh | 6 ------
ci/upload-github-release-asset.sh | 2 +-
11 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/.github/workflows/release-artifacts-auto.yml b/.github/workflows/release-artifacts-auto.yml
index 0cdd176e04396c..9f5a43ac6c7b3d 100644
--- a/.github/workflows/release-artifacts-auto.yml
+++ b/.github/workflows/release-artifacts-auto.yml
@@ -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 }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 78a6d029d4c063..a52458de96cdd7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
uses: "buildkite/trigger-pipeline-action@v2.0.0"
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"
diff --git a/ci/buildkite-pipeline-in-disk.sh b/ci/buildkite-pipeline-in-disk.sh
index 2ce8af0432106b..d21111c33fe70f 100755
--- a/ci/buildkite-pipeline-in-disk.sh
+++ b/ci/buildkite-pipeline-in-disk.sh
@@ -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:
@@ -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
@@ -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
diff --git a/ci/buildkite-pipeline.sh b/ci/buildkite-pipeline.sh
index 2d3aa6c6e5a013..66cb2ce08c07f0 100755
--- a/ci/buildkite-pipeline.sh
+++ b/ci/buildkite-pipeline.sh
@@ -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
@@ -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
@@ -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
diff --git a/ci/buildkite-solana-private.sh b/ci/buildkite-solana-private.sh
index 51876cfeeea60e..6154a51cba0bf9 100755
--- a/ci/buildkite-solana-private.sh
+++ b/ci/buildkite-solana-private.sh
@@ -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:
@@ -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
diff --git a/ci/channel-info.sh b/ci/channel-info.sh
index 2bb808365653c6..400152728cb1a7 100755
--- a/ci/channel-info.sh
+++ b/ci/channel-info.sh
@@ -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
#
diff --git a/ci/dependabot-pr.sh b/ci/dependabot-pr.sh
index 8638a7d52578e7..967425d52b048c 100755
--- a/ci/dependabot-pr.sh
+++ b/ci/dependabot-pr.sh
@@ -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"])')
diff --git a/ci/env.sh b/ci/env.sh
index 1c8153b525b97b..b04709b5393cf8 100644
--- a/ci/env.sh
+++ b/ci/env.sh
@@ -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
diff --git a/ci/test-coverage.sh b/ci/test-coverage.sh
index ffd362acd287b8..0d0350dfbfdde0 100755
--- a/ci/test-coverage.sh
+++ b/ci/test-coverage.sh
@@ -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
diff --git a/ci/upload-ci-artifact.sh b/ci/upload-ci-artifact.sh
index e7cc34ab2b2d8c..8ddd3ec0c8e3c1 100644
--- a/ci/upload-ci-artifact.sh
+++ b/ci/upload-ci-artifact.sh
@@ -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"
}
diff --git a/ci/upload-github-release-asset.sh b/ci/upload-github-release-asset.sh
index 229fb8993edafd..8d4f442ffe09a7 100755
--- a/ci/upload-github-release-asset.sh
+++ b/ci/upload-github-release-asset.sh
@@ -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