From 0170493a1fd337f11009956e1ea9e5deab6ee2d0 Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Wed, 25 May 2022 17:08:10 +0300 Subject: [PATCH 01/20] Refactoring: Abstracted benchmark results into matrix & switched to luau-lang results repo for results --- .github/workflows/benchmark-cachegrind.yml | 5 +++-- .github/workflows/benchmark.yml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/benchmark-cachegrind.yml b/.github/workflows/benchmark-cachegrind.yml index 1a48d6cf..3e81cc44 100644 --- a/.github/workflows/benchmark-cachegrind.yml +++ b/.github/workflows/benchmark-cachegrind.yml @@ -26,6 +26,7 @@ jobs: cachegrindTitle: "Performance", cachegrindIterCount: 20, } + benchResultsRepo: [{ name: "luau-lang/benchmark-data", branch: "main" }] runs-on: ${{ matrix.os }} steps: @@ -59,8 +60,8 @@ jobs: - name: Switch to & checkout benchmark results (gh-pages) repo uses: actions/checkout@v3 with: - repository: AllanJeremy/luau-benchmark-results - ref: "main" + repository: ${{ matrix.benchmarkResultsRepo.name }} + ref: ${{ matrix.benchmarkResultsRepo.branch }} token: "${{ secrets.BENCH_GITHUB_TOKEN }}" path: "./gh-pages" diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index f397160e..59571779 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -26,6 +26,7 @@ jobs: cachegrindTitle: "Performance", cachegrindIterCount: 20, } + benchResultsRepo: [{ name: "luau-lang/benchmark-data", branch: "main" }] runs-on: ${{ matrix.os }} steps: @@ -51,8 +52,8 @@ jobs: - name: Switch to & checkout benchmark results (gh-pages) repo uses: actions/checkout@v3 with: - repository: AllanJeremy/luau-benchmark-results - ref: "main" + repository: ${{ matrix.benchmarkResultsRepo.name }} + ref: ${{ matrix.benchmarkResultsRepo.branch }} path: "./gh-pages" #Run `github-action-benchmark` action From bfa85f8b8c99bc6ef2da65308bc0245f9b285b12 Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Wed, 25 May 2022 17:20:11 +0300 Subject: [PATCH 02/20] Cleanup: Updated messages & removed unnecessary BENCH_GITHUB_TOKEN references in actions/checkout --- .github/workflows/benchmark-cachegrind.yml | 6 ++---- .github/workflows/benchmark.yml | 5 +++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/benchmark-cachegrind.yml b/.github/workflows/benchmark-cachegrind.yml index 3e81cc44..be016430 100644 --- a/.github/workflows/benchmark-cachegrind.yml +++ b/.github/workflows/benchmark-cachegrind.yml @@ -30,9 +30,8 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 - with: - token: "${{ secrets.BENCH_GITHUB_TOKEN }}" + - name: Checkout Luau + uses: actions/checkout@v3 - name: Build Luau run: make config=release luau luau-analyze @@ -62,7 +61,6 @@ jobs: with: repository: ${{ matrix.benchmarkResultsRepo.name }} ref: ${{ matrix.benchmarkResultsRepo.branch }} - token: "${{ secrets.BENCH_GITHUB_TOKEN }}" path: "./gh-pages" #Run `github-action-benchmark` action diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 59571779..4642c841 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -30,7 +30,8 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - name: Checkout Luau repository + uses: actions/checkout@v3 - name: Build Luau run: make config=release luau luau-analyze @@ -49,7 +50,7 @@ jobs: run: | python bench/bench.py | tee ${{ matrix.bench.script }}-output.txt - - name: Switch to & checkout benchmark results (gh-pages) repo + - name: Checkout Benchmark Results repository uses: actions/checkout@v3 with: repository: ${{ matrix.benchmarkResultsRepo.name }} From 00e1a1a2ce537e29a7ed172fcd708b40a338f699 Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Wed, 25 May 2022 17:26:29 +0300 Subject: [PATCH 03/20] Cleanup: Updated checkout step name --- .github/workflows/benchmark-cachegrind.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmark-cachegrind.yml b/.github/workflows/benchmark-cachegrind.yml index be016430..a234275b 100644 --- a/.github/workflows/benchmark-cachegrind.yml +++ b/.github/workflows/benchmark-cachegrind.yml @@ -56,7 +56,7 @@ jobs: - name: Run ${{ matrix.bench.title }} (Warm Cachegrind) run: sudo bash ./scripts/run-with-cachegrind.sh python ./bench/bench.py "${{ matrix.bench.cachegrindTitle }}" ${{ matrix.bench.cachegrindIterCount }} | tee -a ${{ matrix.bench.script }}-output.txt - - name: Switch to & checkout benchmark results (gh-pages) repo + - name: Checkout Benchmark Results repository uses: actions/checkout@v3 with: repository: ${{ matrix.benchmarkResultsRepo.name }} From dbee93133d53e6597ee088b772ff2f51cec84166 Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Wed, 25 May 2022 17:30:07 +0300 Subject: [PATCH 04/20] Cleanup: Updated benchmark results repo TODO: Change this to Luau benchmark data one --- .github/workflows/benchmark-cachegrind.yml | 3 ++- .github/workflows/benchmark.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/benchmark-cachegrind.yml b/.github/workflows/benchmark-cachegrind.yml index a234275b..a87f17d3 100644 --- a/.github/workflows/benchmark-cachegrind.yml +++ b/.github/workflows/benchmark-cachegrind.yml @@ -26,7 +26,8 @@ jobs: cachegrindTitle: "Performance", cachegrindIterCount: 20, } - benchResultsRepo: [{ name: "luau-lang/benchmark-data", branch: "main" }] + benchResultsRepo: + [{ name: "AllanJeremy/luau-benchmark-results", branch: "main" }] runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 4642c841..9604b45a 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -26,7 +26,8 @@ jobs: cachegrindTitle: "Performance", cachegrindIterCount: 20, } - benchResultsRepo: [{ name: "luau-lang/benchmark-data", branch: "main" }] + benchResultsRepo: + [{ name: "AllanJeremy/luau-benchmark-results", branch: "main" }] runs-on: ${{ matrix.os }} steps: From f76bfc805b3e0178b2edadf1b67588a965706a81 Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Wed, 25 May 2022 17:45:33 +0300 Subject: [PATCH 05/20] Debug WIP --- .github/workflows/benchmark.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 9604b45a..38afc628 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -58,6 +58,9 @@ jobs: ref: ${{ matrix.benchmarkResultsRepo.branch }} path: "./gh-pages" + - name: Print gh-pages directory (benchmark results repo expected) + run: ls gh-pages + #Run `github-action-benchmark` action - name: Store ${{ matrix.bench.title }} result uses: Roblox/rhysd-github-action-benchmark@v-luau From d593ec8c3dd9f6c51a81de278ac92939fe8f23d4 Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Wed, 25 May 2022 18:03:01 +0300 Subject: [PATCH 06/20] Debug WIP --- .github/workflows/benchmark-cachegrind.yml | 2 +- .github/workflows/benchmark.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/benchmark-cachegrind.yml b/.github/workflows/benchmark-cachegrind.yml index a87f17d3..dd5b1a2b 100644 --- a/.github/workflows/benchmark-cachegrind.yml +++ b/.github/workflows/benchmark-cachegrind.yml @@ -27,7 +27,7 @@ jobs: cachegrindIterCount: 20, } benchResultsRepo: - [{ name: "AllanJeremy/luau-benchmark-results", branch: "main" }] + - { name: "AllanJeremy/luau-benchmark-results", branch: "main" } runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 38afc628..b0cdbbb3 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -27,7 +27,7 @@ jobs: cachegrindIterCount: 20, } benchResultsRepo: - [{ name: "AllanJeremy/luau-benchmark-results", branch: "main" }] + - { name: "AllanJeremy/luau-benchmark-results", branch: "main" } runs-on: ${{ matrix.os }} steps: From e2585df31ff6e44bc3c3897ec438d340768ca821 Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Wed, 25 May 2022 18:09:38 +0300 Subject: [PATCH 07/20] Debug WIP: Fixed typo --- .github/workflows/benchmark-cachegrind.yml | 4 ++-- .github/workflows/benchmark.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/benchmark-cachegrind.yml b/.github/workflows/benchmark-cachegrind.yml index dd5b1a2b..ca6e76df 100644 --- a/.github/workflows/benchmark-cachegrind.yml +++ b/.github/workflows/benchmark-cachegrind.yml @@ -60,8 +60,8 @@ jobs: - name: Checkout Benchmark Results repository uses: actions/checkout@v3 with: - repository: ${{ matrix.benchmarkResultsRepo.name }} - ref: ${{ matrix.benchmarkResultsRepo.branch }} + repository: ${{ matrix.benchResultsRepo.name }} + ref: ${{ matrix.benchResultsRepo.branch }} path: "./gh-pages" #Run `github-action-benchmark` action diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index b0cdbbb3..f3fc90a3 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -54,8 +54,8 @@ jobs: - name: Checkout Benchmark Results repository uses: actions/checkout@v3 with: - repository: ${{ matrix.benchmarkResultsRepo.name }} - ref: ${{ matrix.benchmarkResultsRepo.branch }} + repository: ${{ matrix.benchResultsRepo.name }} + ref: ${{ matrix.benchResultsRepo.branch }} path: "./gh-pages" - name: Print gh-pages directory (benchmark results repo expected) From d7e7371898c6e60bbc291c33143dfc5ef3daec54 Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Wed, 25 May 2022 18:15:25 +0300 Subject: [PATCH 08/20] Cleanup: Removed debug statement from benchmark.yml --- .github/workflows/benchmark.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index f3fc90a3..8fe207b1 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -58,9 +58,6 @@ jobs: ref: ${{ matrix.benchResultsRepo.branch }} path: "./gh-pages" - - name: Print gh-pages directory (benchmark results repo expected) - run: ls gh-pages - #Run `github-action-benchmark` action - name: Store ${{ matrix.bench.title }} result uses: Roblox/rhysd-github-action-benchmark@v-luau From 9b7472be51652c567125b5f0841bc5ed5c8aae30 Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Thu, 26 May 2022 13:48:01 +0300 Subject: [PATCH 09/20] Cleanup: Removed comments in workflow files --- .github/workflows/benchmark-cachegrind.yml | 4 ---- .github/workflows/benchmark.yml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/.github/workflows/benchmark-cachegrind.yml b/.github/workflows/benchmark-cachegrind.yml index ca6e76df..1ebcd7c1 100644 --- a/.github/workflows/benchmark-cachegrind.yml +++ b/.github/workflows/benchmark-cachegrind.yml @@ -64,16 +64,12 @@ jobs: ref: ${{ matrix.benchResultsRepo.branch }} path: "./gh-pages" - #Run `github-action-benchmark` action - name: Store ${{ matrix.bench.title }} result uses: Roblox/rhysd-github-action-benchmark@v-luau with: name: ${{ matrix.bench.title }} tool: "roblox" - # This should come from Luau repo output-file-path: ./${{ matrix.bench.script }}-output.txt - - # This should map to thebenchmark results repo external-data-json-path: ./gh-pages/dev/bench/data.json alert-threshold: 150% fail-threshold: 200% diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 8fe207b1..c061c613 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -58,16 +58,12 @@ jobs: ref: ${{ matrix.benchResultsRepo.branch }} path: "./gh-pages" - #Run `github-action-benchmark` action - name: Store ${{ matrix.bench.title }} result uses: Roblox/rhysd-github-action-benchmark@v-luau with: name: ${{ matrix.bench.title }} tool: "benchmarkluau" - # This should come from Luau repo output-file-path: ./${{ matrix.bench.script }}-output.txt - - # This should map to thebenchmark results repo external-data-json-path: ./gh-pages/dev/bench/data.json alert-threshold: 150% fail-threshold: 200% From 2426940854ee58a693ef2823388c48688756db22 Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Thu, 26 May 2022 14:50:38 +0300 Subject: [PATCH 10/20] Debug WIP --- .github/workflows/benchmark.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index c061c613..5b6d8427 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -8,6 +8,15 @@ on: - "rfcs/**" - "*.md" - "prototyping/**" + push: + branches: + - master + paths-ignore: + - "docs/**" + - "papers/**" + - "rfcs/**" + - "*.md" + - "prototyping/**" jobs: benchmarks-run: @@ -71,3 +80,8 @@ jobs: comment-on-alert: true comment-always: true github-token: ${{ secrets.BENCH_GITHUB_TOKEN }} + + - name: Push benchmark results + if: !!github.event.push + run: | + echo "Pushing benchmark results..." From e90e232a74bc2e1ee013420b6dc6f60982f858a9 Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Thu, 26 May 2022 14:52:24 +0300 Subject: [PATCH 11/20] Debug WIP --- .github/workflows/benchmark.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 5b6d8427..e6a8f05a 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -82,6 +82,6 @@ jobs: github-token: ${{ secrets.BENCH_GITHUB_TOKEN }} - name: Push benchmark results - if: !!github.event.push + if: github.event.push run: | echo "Pushing benchmark results..." From 9805e79003e9cbd7e69042f4d124f27e6a7e0370 Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Thu, 26 May 2022 14:53:50 +0300 Subject: [PATCH 12/20] Debug WIP --- .github/workflows/benchmark.yml | 69 ++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index e6a8f05a..21482261 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -43,45 +43,50 @@ jobs: - name: Checkout Luau repository uses: actions/checkout@v3 - - name: Build Luau - run: make config=release luau luau-analyze + # - name: Build Luau + # run: make config=release luau luau-analyze - - uses: actions/setup-python@v3 - with: - python-version: "3.9" - architecture: "x64" + # - uses: actions/setup-python@v3 + # with: + # python-version: "3.9" + # architecture: "x64" - - name: Install python dependencies - run: | - python -m pip install requests - python -m pip install --user numpy scipy matplotlib ipython jupyter pandas sympy nose + # - name: Install python dependencies + # run: | + # python -m pip install requests + # python -m pip install --user numpy scipy matplotlib ipython jupyter pandas sympy nose - - name: Run benchmark - run: | - python bench/bench.py | tee ${{ matrix.bench.script }}-output.txt + # - name: Run benchmark + # run: | + # python bench/bench.py | tee ${{ matrix.bench.script }}-output.txt - - name: Checkout Benchmark Results repository - uses: actions/checkout@v3 - with: - repository: ${{ matrix.benchResultsRepo.name }} - ref: ${{ matrix.benchResultsRepo.branch }} - path: "./gh-pages" + # - name: Checkout Benchmark Results repository + # uses: actions/checkout@v3 + # with: + # repository: ${{ matrix.benchResultsRepo.name }} + # ref: ${{ matrix.benchResultsRepo.branch }} + # path: "./gh-pages" - - name: Store ${{ matrix.bench.title }} result - uses: Roblox/rhysd-github-action-benchmark@v-luau - with: - name: ${{ matrix.bench.title }} - tool: "benchmarkluau" - output-file-path: ./${{ matrix.bench.script }}-output.txt - external-data-json-path: ./gh-pages/dev/bench/data.json - alert-threshold: 150% - fail-threshold: 200% - fail-on-alert: true - comment-on-alert: true - comment-always: true - github-token: ${{ secrets.BENCH_GITHUB_TOKEN }} + # - name: Store ${{ matrix.bench.title }} result + # uses: Roblox/rhysd-github-action-benchmark@v-luau + # with: + # name: ${{ matrix.bench.title }} + # tool: "benchmarkluau" + # output-file-path: ./${{ matrix.bench.script }}-output.txt + # external-data-json-path: ./gh-pages/dev/bench/data.json + # alert-threshold: 150% + # fail-threshold: 200% + # fail-on-alert: true + # comment-on-alert: true + # comment-always: true + # github-token: ${{ secrets.BENCH_GITHUB_TOKEN }} - name: Push benchmark results if: github.event.push run: | echo "Pushing benchmark results..." + + - name: Pull request resulst + if: github.event.pull_request + run: | + echo "Pulling benchmark results..." From 47121c81f0399011d4803d7adfb059f83426ad58 Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Thu, 26 May 2022 14:59:14 +0300 Subject: [PATCH 13/20] Enhancement: Added push results to benchmark results --- .github/workflows/benchmark-cachegrind.yml | 10 +++ .github/workflows/benchmark.yml | 74 +++++++++++----------- 2 files changed, 47 insertions(+), 37 deletions(-) diff --git a/.github/workflows/benchmark-cachegrind.yml b/.github/workflows/benchmark-cachegrind.yml index 1ebcd7c1..a4855ee1 100644 --- a/.github/workflows/benchmark-cachegrind.yml +++ b/.github/workflows/benchmark-cachegrind.yml @@ -77,3 +77,13 @@ jobs: comment-on-alert: true comment-always: true github-token: ${{ secrets.BENCH_GITHUB_TOKEN }} + + - name: Push benchmark results + if: github.event.push + run: | + echo "Pushing benchmark results..." + cd gh-pages + git add ./dev/bench/data.json + git commit -m "Add benchmarks results for ${{ github.sha }}" + git push + cd .. diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 21482261..1c51303f 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -43,50 +43,50 @@ jobs: - name: Checkout Luau repository uses: actions/checkout@v3 - # - name: Build Luau - # run: make config=release luau luau-analyze + - name: Build Luau + run: make config=release luau luau-analyze - # - uses: actions/setup-python@v3 - # with: - # python-version: "3.9" - # architecture: "x64" + - uses: actions/setup-python@v3 + with: + python-version: "3.9" + architecture: "x64" - # - name: Install python dependencies - # run: | - # python -m pip install requests - # python -m pip install --user numpy scipy matplotlib ipython jupyter pandas sympy nose + - name: Install python dependencies + run: | + python -m pip install requests + python -m pip install --user numpy scipy matplotlib ipython jupyter pandas sympy nose - # - name: Run benchmark - # run: | - # python bench/bench.py | tee ${{ matrix.bench.script }}-output.txt + - name: Run benchmark + run: | + python bench/bench.py | tee ${{ matrix.bench.script }}-output.txt - # - name: Checkout Benchmark Results repository - # uses: actions/checkout@v3 - # with: - # repository: ${{ matrix.benchResultsRepo.name }} - # ref: ${{ matrix.benchResultsRepo.branch }} - # path: "./gh-pages" + - name: Checkout Benchmark Results repository + uses: actions/checkout@v3 + with: + repository: ${{ matrix.benchResultsRepo.name }} + ref: ${{ matrix.benchResultsRepo.branch }} + path: "./gh-pages" - # - name: Store ${{ matrix.bench.title }} result - # uses: Roblox/rhysd-github-action-benchmark@v-luau - # with: - # name: ${{ matrix.bench.title }} - # tool: "benchmarkluau" - # output-file-path: ./${{ matrix.bench.script }}-output.txt - # external-data-json-path: ./gh-pages/dev/bench/data.json - # alert-threshold: 150% - # fail-threshold: 200% - # fail-on-alert: true - # comment-on-alert: true - # comment-always: true - # github-token: ${{ secrets.BENCH_GITHUB_TOKEN }} + - name: Store ${{ matrix.bench.title }} result + uses: Roblox/rhysd-github-action-benchmark@v-luau + with: + name: ${{ matrix.bench.title }} + tool: "benchmarkluau" + output-file-path: ./${{ matrix.bench.script }}-output.txt + external-data-json-path: ./gh-pages/dev/bench/data.json + alert-threshold: 150% + fail-threshold: 200% + fail-on-alert: true + comment-on-alert: true + comment-always: true + github-token: ${{ secrets.BENCH_GITHUB_TOKEN }} - name: Push benchmark results if: github.event.push run: | echo "Pushing benchmark results..." - - - name: Pull request resulst - if: github.event.pull_request - run: | - echo "Pulling benchmark results..." + cd gh-pages + git add ./dev/bench/data.json + git commit -m "Add benchmarks results for ${{ github.sha }}" + git push + cd .. From 6597c8743eadead4688f1ab4a7dabbe12541b803 Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Thu, 26 May 2022 15:01:09 +0300 Subject: [PATCH 14/20] Debug WIP --- .github/workflows/benchmark-cachegrind.yml | 15 +++++++++++++-- .github/workflows/benchmark.yml | 17 +++++++++-------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/.github/workflows/benchmark-cachegrind.yml b/.github/workflows/benchmark-cachegrind.yml index a4855ee1..ebbfbc0e 100644 --- a/.github/workflows/benchmark-cachegrind.yml +++ b/.github/workflows/benchmark-cachegrind.yml @@ -1,7 +1,18 @@ name: Luau Benchmarks (CacheGrind) on: - pull_request: + # pull_request: + # paths-ignore: + # - "docs/**" + # - "papers/**" + # - "rfcs/**" + # - "*.md" + # - "prototyping/**" + + push: + branches: + - master + - feat/add-cachegrind paths-ignore: - "docs/**" - "papers/**" @@ -27,7 +38,7 @@ jobs: cachegrindIterCount: 20, } benchResultsRepo: - - { name: "AllanJeremy/luau-benchmark-results", branch: "main" } + - { name: "AllanJeremy/luau-benchmark-results", branch: "test" } runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 1c51303f..23efbc99 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -1,16 +1,17 @@ name: Luau Benchmarks on: - pull_request: - paths-ignore: - - "docs/**" - - "papers/**" - - "rfcs/**" - - "*.md" - - "prototyping/**" + # pull_request: + # paths-ignore: + # - "docs/**" + # - "papers/**" + # - "rfcs/**" + # - "*.md" + # - "prototyping/**" push: branches: - master + - feat/add-cachegrind paths-ignore: - "docs/**" - "papers/**" @@ -36,7 +37,7 @@ jobs: cachegrindIterCount: 20, } benchResultsRepo: - - { name: "AllanJeremy/luau-benchmark-results", branch: "main" } + - { name: "AllanJeremy/luau-benchmark-results", branch: "test" } runs-on: ${{ matrix.os }} steps: From ab0dd7990de4f206f03bee5f7f60cb1c5ce57c3c Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Thu, 26 May 2022 15:06:47 +0300 Subject: [PATCH 15/20] Debug WIP --- .github/workflows/benchmark-cachegrind.yml | 2 +- .github/workflows/benchmark.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/benchmark-cachegrind.yml b/.github/workflows/benchmark-cachegrind.yml index ebbfbc0e..5bb8613b 100644 --- a/.github/workflows/benchmark-cachegrind.yml +++ b/.github/workflows/benchmark-cachegrind.yml @@ -90,7 +90,7 @@ jobs: github-token: ${{ secrets.BENCH_GITHUB_TOKEN }} - name: Push benchmark results - if: github.event.push + if: github.event_name == "push" run: | echo "Pushing benchmark results..." cd gh-pages diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 23efbc99..a81b95fe 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -83,7 +83,7 @@ jobs: github-token: ${{ secrets.BENCH_GITHUB_TOKEN }} - name: Push benchmark results - if: github.event.push + if: github.event_name == "push" run: | echo "Pushing benchmark results..." cd gh-pages From 656f8421eab08f752fe42c41b17bfc408c5eb591 Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Thu, 26 May 2022 15:07:34 +0300 Subject: [PATCH 16/20] Debug WIP --- .github/workflows/benchmark-cachegrind.yml | 2 +- .github/workflows/benchmark.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/benchmark-cachegrind.yml b/.github/workflows/benchmark-cachegrind.yml index 5bb8613b..b686a436 100644 --- a/.github/workflows/benchmark-cachegrind.yml +++ b/.github/workflows/benchmark-cachegrind.yml @@ -90,7 +90,7 @@ jobs: github-token: ${{ secrets.BENCH_GITHUB_TOKEN }} - name: Push benchmark results - if: github.event_name == "push" + if: github.event_name == 'push' run: | echo "Pushing benchmark results..." cd gh-pages diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index a81b95fe..c43a6ed9 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -83,7 +83,7 @@ jobs: github-token: ${{ secrets.BENCH_GITHUB_TOKEN }} - name: Push benchmark results - if: github.event_name == "push" + if: github.event_name == 'push' run: | echo "Pushing benchmark results..." cd gh-pages From 5df61e611e9cc561e1ac9e6fbcbf456b032b32c8 Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Thu, 26 May 2022 15:12:24 +0300 Subject: [PATCH 17/20] Debug WIP: --- .github/workflows/benchmark-cachegrind.yml | 2 ++ .github/workflows/benchmark.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/benchmark-cachegrind.yml b/.github/workflows/benchmark-cachegrind.yml index b686a436..b5394a9f 100644 --- a/.github/workflows/benchmark-cachegrind.yml +++ b/.github/workflows/benchmark-cachegrind.yml @@ -94,6 +94,8 @@ jobs: run: | echo "Pushing benchmark results..." cd gh-pages + git config user.name github-actions + git config user.email github@users.noreply.github.com git add ./dev/bench/data.json git commit -m "Add benchmarks results for ${{ github.sha }}" git push diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index c43a6ed9..3fe660b4 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -87,6 +87,8 @@ jobs: run: | echo "Pushing benchmark results..." cd gh-pages + git config user.name github-actions + git config user.email github@users.noreply.github.com git add ./dev/bench/data.json git commit -m "Add benchmarks results for ${{ github.sha }}" git push From 100556e0841ecec571005b2bf2e74afcd78bd07b Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Thu, 26 May 2022 15:17:52 +0300 Subject: [PATCH 18/20] Debug WIP: --- .github/workflows/benchmark-cachegrind.yml | 2 +- .github/workflows/benchmark.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/benchmark-cachegrind.yml b/.github/workflows/benchmark-cachegrind.yml index b5394a9f..1422636c 100644 --- a/.github/workflows/benchmark-cachegrind.yml +++ b/.github/workflows/benchmark-cachegrind.yml @@ -73,6 +73,7 @@ jobs: with: repository: ${{ matrix.benchResultsRepo.name }} ref: ${{ matrix.benchResultsRepo.branch }} + token: ${{ secrets.BENCH_GITHUB_TOKEN }} path: "./gh-pages" - name: Store ${{ matrix.bench.title }} result @@ -87,7 +88,6 @@ jobs: fail-on-alert: true comment-on-alert: true comment-always: true - github-token: ${{ secrets.BENCH_GITHUB_TOKEN }} - name: Push benchmark results if: github.event_name == 'push' diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 3fe660b4..ba009e39 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -66,6 +66,7 @@ jobs: with: repository: ${{ matrix.benchResultsRepo.name }} ref: ${{ matrix.benchResultsRepo.branch }} + token: ${{ secrets.BENCH_GITHUB_TOKEN }} path: "./gh-pages" - name: Store ${{ matrix.bench.title }} result @@ -80,7 +81,6 @@ jobs: fail-on-alert: true comment-on-alert: true comment-always: true - github-token: ${{ secrets.BENCH_GITHUB_TOKEN }} - name: Push benchmark results if: github.event_name == 'push' From a9c3cbb0107c5adb839b60af7c2597d17e4f49af Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Thu, 26 May 2022 15:23:29 +0300 Subject: [PATCH 19/20] Debug WIP --- .github/workflows/benchmark-cachegrind.yml | 1 + .github/workflows/benchmark.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/benchmark-cachegrind.yml b/.github/workflows/benchmark-cachegrind.yml index 1422636c..edfc5f17 100644 --- a/.github/workflows/benchmark-cachegrind.yml +++ b/.github/workflows/benchmark-cachegrind.yml @@ -88,6 +88,7 @@ jobs: fail-on-alert: true comment-on-alert: true comment-always: true + github-token: ${{ secrets.GITHUB_TOKEN }} - name: Push benchmark results if: github.event_name == 'push' diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index ba009e39..0e808e10 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -81,6 +81,7 @@ jobs: fail-on-alert: true comment-on-alert: true comment-always: true + github-token: ${{ secrets.GITHUB_TOKEN }} - name: Push benchmark results if: github.event_name == 'push' From 1bd380a5b4538f840ce00036f74f4365ca992394 Mon Sep 17 00:00:00 2001 From: Allan Jeremy Date: Mon, 30 May 2022 13:08:26 +0300 Subject: [PATCH 20/20] Cleanup: Added on PR event to workflows --- .github/workflows/benchmark-cachegrind.yml | 17 ++++++++--------- .github/workflows/benchmark.yml | 17 ++++++++--------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/.github/workflows/benchmark-cachegrind.yml b/.github/workflows/benchmark-cachegrind.yml index edfc5f17..c7ebca62 100644 --- a/.github/workflows/benchmark-cachegrind.yml +++ b/.github/workflows/benchmark-cachegrind.yml @@ -1,18 +1,17 @@ name: Luau Benchmarks (CacheGrind) on: - # pull_request: - # paths-ignore: - # - "docs/**" - # - "papers/**" - # - "rfcs/**" - # - "*.md" - # - "prototyping/**" + pull_request: + paths-ignore: + - "docs/**" + - "papers/**" + - "rfcs/**" + - "*.md" + - "prototyping/**" push: branches: - master - - feat/add-cachegrind paths-ignore: - "docs/**" - "papers/**" @@ -38,7 +37,7 @@ jobs: cachegrindIterCount: 20, } benchResultsRepo: - - { name: "AllanJeremy/luau-benchmark-results", branch: "test" } + - { name: "luau-lang/benchmark-data", branch: "main" } runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 0e808e10..2b6237c2 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -1,17 +1,16 @@ name: Luau Benchmarks on: - # pull_request: - # paths-ignore: - # - "docs/**" - # - "papers/**" - # - "rfcs/**" - # - "*.md" - # - "prototyping/**" + pull_request: + paths-ignore: + - "docs/**" + - "papers/**" + - "rfcs/**" + - "*.md" + - "prototyping/**" push: branches: - master - - feat/add-cachegrind paths-ignore: - "docs/**" - "papers/**" @@ -37,7 +36,7 @@ jobs: cachegrindIterCount: 20, } benchResultsRepo: - - { name: "AllanJeremy/luau-benchmark-results", branch: "test" } + - { name: "luau-lang/benchmark-data", branch: "main" } runs-on: ${{ matrix.os }} steps: