From c64e913ce4d55d50d98f3bb548fddd224b4c3e31 Mon Sep 17 00:00:00 2001 From: Maximilian Hoffman Date: Thu, 28 Apr 2022 11:02:04 -0700 Subject: [PATCH] Max/fix nightly (#3316) * Nightly benchmarks * dispatch * del comment brnach * merge conflict * mysql-dolt * change if or to double brackets --- .../scripts/performance-benchmarking/run-benchmarks.sh | 2 +- .github/scripts/sql-correctness/run-correctness.sh | 2 +- .github/workflows/ci-nightly.yaml | 10 +++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/scripts/performance-benchmarking/run-benchmarks.sh b/.github/scripts/performance-benchmarking/run-benchmarks.sh index 4ad1f4682f..c4358c8b06 100755 --- a/.github/scripts/performance-benchmarking/run-benchmarks.sh +++ b/.github/scripts/performance-benchmarking/run-benchmarks.sh @@ -43,7 +43,7 @@ timeprefix=$(date +%Y/%m/%d) actorprefix="$MODE/$ACTOR/$actorShort" format="markdown" -if [ "$MODE" = "release" ]; then +if [[ "$MODE" = "release" || "$MODE" = "nightly" ]]; then format="html" fi diff --git a/.github/scripts/sql-correctness/run-correctness.sh b/.github/scripts/sql-correctness/run-correctness.sh index e42182b208..fdd44bc77f 100755 --- a/.github/scripts/sql-correctness/run-correctness.sh +++ b/.github/scripts/sql-correctness/run-correctness.sh @@ -46,7 +46,7 @@ timeprefix=$(date +%Y/%m/%d) actorprefix="$MODE/$ACTOR/$actorShort" format="markdown" -if [ "$MODE" = "release" ]; then +if [[ "$MODE" = "release" || "$MODE" = "nightly" ]]; then format="html" fi diff --git a/.github/workflows/ci-nightly.yaml b/.github/workflows/ci-nightly.yaml index 1c0a56418f..9c857775df 100644 --- a/.github/workflows/ci-nightly.yaml +++ b/.github/workflows/ci-nightly.yaml @@ -24,10 +24,6 @@ jobs: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-west-2 - - uses: xt0rted/pull-request-comment-branch@v1 - id: comment-branch - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - name: Create and Auth kubeconfig run: | echo "$CONFIG" > kubeconfig @@ -44,17 +40,17 @@ jobs: FROM_VERSION: '8.0.28' TO_SERVER: 'dolt' TO_VERSION: ${{ github.sha }} - MODE: 'release' + MODE: 'nightly' ACTOR: ${{ github.actor }} REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }} KUBECONFIG: "./kubeconfig" - TEMPLATE_SCRIPT: "./.github/scripts/performance-benchmarking/get-dolt-dolt-job-json.sh" + TEMPLATE_SCRIPT: "./.github/scripts/performance-benchmarking/get-mysql-dolt-job-json.sh" - name: Run correctness id: run-correctness run: ./.github/scripts/sql-correctness/run-correctness.sh env: TO_VERSION: ${{ github.sha }} - MODE: 'release' + MODE: 'nightly' ACTOR: ${{ github.actor }} ACTOR_EMAIL: 'max@dolthub.com' REPO_ACCESS_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}