Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

workflows: fix cockroach-microbench-ci step failing #1

Closed
wants to merge 1 commit into from
+5 −4
Closed

workflows: fix cockroach-microbench-ci step failing #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions .github/workflows/github-actions-essential-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,7 @@ jobs:

# Set the latest commit hash as an output variable
echo "::set-output name=latest_commit::$LATEST_COMMIT"
if: ${{ github.event_name != 'push' }}
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha || github.ref }}
Expand All @@ -380,11 +381,11 @@ jobs:
run: ./build/github/cockroach-microbench-ci.sh
env:
COMPARE_THRESHOLD: "5.00"
PUSH_STEP: ${{ github.event_name == 'push' }}
PUSH_STEP: ${{ github.event_name == 'push' && env.GITHUB_ACTIONS_BRANCH != 'staging' }}
BASE_SHA: ${{ steps.get_latest_commit_target_branch.outputs.latest_commit }}

# TODO(sambhav-jain-16): add Performance note check and use this flag. Currently set to false (https://github.com/cockroachdb/cockroach/issues/106661)
SKIP_COMPARISON: false
SKIP_COMPARISON: ${{ env.GITHUB_ACTIONS_BRANCH == 'staging' }}
- name: upload build results
run: ./build/github/summarize-build.sh bes.bin
if: always()
Expand Down
4 changes: 2 additions & 2 deletions build/github/cockroach-microbench-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ $roachprod_microbench_dir/roachprod-microbench clean "$log_output_file_path" "$c

# Push artifact if this is a base merge and skip comparison
if $PUSH_STEP; then
gcloud storage cp "$cleaned_current_dir/$benchmark_file_name" "$storage_bucket_url/$GITHUB_HEAD_REF/$GITHUB_SHA.log"
echo "Skipping comparison since this is a base merge."
gcloud storage cp "$cleaned_current_dir/$benchmark_file_name" "$storage_bucket_url/$GITHUB_REF/$GITHUB_SHA.log"
echo "Skipping comparison since this is a push step into the target branch"
exit $success_exit_status
fi

Expand Down
Loading