Skip to content

Commit

Permalink
Merge branch 'main' into exclude-benchmarks
Browse files Browse the repository at this point in the history
  • Loading branch information
mpage committed Nov 22, 2024
2 parents 9ddb66d + eafcdea commit a3cd4f6
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 37 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/_benchmark.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Generated file: !!! DO NOT EDIT !!!
---
env:
PYPERFORMANCE_HASH: ebb37f3583e26ea22cee34126b3b8a815112370b
PYSTON_BENCHMARKS_HASH: 004743ccbd9e54598c543d7eb71fd3b8e10d5750
PYPERFORMANCE_HASH: 9164273e5504c410a5be08d8753c91be708fdd9a
PYSTON_BENCHMARKS_HASH: 265655e7f03ace13ec1e00e1ba299179e69f8a00
name: _benchmark
on:
workflow_call:
Expand Down Expand Up @@ -107,6 +107,7 @@ jobs:
- name: Checkout CPython
uses: actions/checkout@v4
with:
persist-credentials: false
repository: ${{ inputs.fork }}/cpython
path: cpython
ref: ${{ inputs.ref }}
Expand All @@ -126,13 +127,15 @@ jobs:
uses: actions/checkout@v4
if: ${{ steps.should_run.outputs.should_run != 'false' }}
with:
persist-credentials: false
repository: pyston/python-macrobenchmarks
path: pyston-benchmarks
ref: ${{ env.PYSTON_BENCHMARKS_HASH }}
- name: Checkout pyperformance
uses: actions/checkout@v4
if: ${{ steps.should_run.outputs.should_run != 'false' }}
with:
persist-credentials: false
repository: mdboom/pyperformance
path: pyperformance
ref: ${{ env.PYPERFORMANCE_HASH }}
Expand Down Expand Up @@ -215,6 +218,7 @@ jobs:
- name: Checkout CPython
uses: actions/checkout@v4
with:
persist-credentials: false
repository: ${{ inputs.fork }}/cpython
path: cpython
ref: ${{ inputs.ref }}
Expand All @@ -234,13 +238,15 @@ jobs:
uses: actions/checkout@v4
if: ${{ steps.should_run.outputs.should_run != 'false' }}
with:
persist-credentials: false
repository: pyston/python-macrobenchmarks
path: pyston-benchmarks
ref: ${{ env.PYSTON_BENCHMARKS_HASH }}
- name: Checkout pyperformance
uses: actions/checkout@v4
if: ${{ steps.should_run.outputs.should_run != 'false' }}
with:
persist-credentials: false
repository: mdboom/pyperformance
path: pyperformance
ref: ${{ env.PYPERFORMANCE_HASH }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/_find_failures.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Generated file: !!! DO NOT EDIT !!!
---
env:
PYPERFORMANCE_HASH: ebb37f3583e26ea22cee34126b3b8a815112370b
PYSTON_BENCHMARKS_HASH: 004743ccbd9e54598c543d7eb71fd3b8e10d5750
PYPERFORMANCE_HASH: 9164273e5504c410a5be08d8753c91be708fdd9a
PYSTON_BENCHMARKS_HASH: 265655e7f03ace13ec1e00e1ba299179e69f8a00
name: _find_failures
on:
schedule:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/_generate.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Generated file: !!! DO NOT EDIT !!!
---
env:
PYPERFORMANCE_HASH: ebb37f3583e26ea22cee34126b3b8a815112370b
PYSTON_BENCHMARKS_HASH: 004743ccbd9e54598c543d7eb71fd3b8e10d5750
PYPERFORMANCE_HASH: 9164273e5504c410a5be08d8753c91be708fdd9a
PYSTON_BENCHMARKS_HASH: 265655e7f03ace13ec1e00e1ba299179e69f8a00
name: _generate
on:
workflow_call:
Expand Down Expand Up @@ -36,6 +36,7 @@ jobs:
- name: Checkout CPython
uses: actions/checkout@v4
with:
persist-credentials: false
repository: python/cpython
path: cpython
- name: Setup system Python
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/_nightly.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Generated file: !!! DO NOT EDIT !!!
---
env:
PYPERFORMANCE_HASH: ebb37f3583e26ea22cee34126b3b8a815112370b
PYSTON_BENCHMARKS_HASH: 004743ccbd9e54598c543d7eb71fd3b8e10d5750
PYPERFORMANCE_HASH: 9164273e5504c410a5be08d8753c91be708fdd9a
PYSTON_BENCHMARKS_HASH: 265655e7f03ace13ec1e00e1ba299179e69f8a00
name: _nightly
on:
schedule:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/_notify.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Generated file: !!! DO NOT EDIT !!!
---
env:
PYPERFORMANCE_HASH: ebb37f3583e26ea22cee34126b3b8a815112370b
PYSTON_BENCHMARKS_HASH: 004743ccbd9e54598c543d7eb71fd3b8e10d5750
PYPERFORMANCE_HASH: 9164273e5504c410a5be08d8753c91be708fdd9a
PYSTON_BENCHMARKS_HASH: 265655e7f03ace13ec1e00e1ba299179e69f8a00
name: _notify
on:
workflow_call:
Expand Down Expand Up @@ -37,6 +37,8 @@ jobs:
- uses: technote-space/workflow-conclusion-action@v3
- name: Checkout benchmarking
uses: actions/checkout@v4
with:
persist-credentials: false
- name: Setup system Python
uses: actions/setup-python@v5
with:
Expand Down
26 changes: 7 additions & 19 deletions .github/workflows/_publish.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Generated file: !!! DO NOT EDIT !!!
---
env:
PYPERFORMANCE_HASH: ebb37f3583e26ea22cee34126b3b8a815112370b
PYSTON_BENCHMARKS_HASH: 004743ccbd9e54598c543d7eb71fd3b8e10d5750
PYPERFORMANCE_HASH: 9164273e5504c410a5be08d8753c91be708fdd9a
PYSTON_BENCHMARKS_HASH: 265655e7f03ace13ec1e00e1ba299179e69f8a00
name: _publish
on:
workflow_call:
Expand All @@ -25,24 +25,12 @@ jobs:
- name: Checkout benchmarking
uses: actions/checkout@v4
with:
path: private
ref: main
fetch-depth: 0
- name: Checkout benchmarking-public
uses: actions/checkout@v4
with:
path: public
ref: main
repository: ${{ github.repository }}-public
# This has to be enough depth to handle since the last time we published.
# As a rule of thumb, (number of machines * 2, plus the generated stuff) * 2
fetch-depth: 20
token: ${{ secrets.BENCHMARK_MIRROR }}
- name: Mirror
run: |
cd public
git remote add upstream $PWD/../private
git fetch upstream
git reset --hard upstream/main
- name: Push
if: ${{ !inputs.dry_run }}
run: |
cd public
git push origin main
git remote add public https://github.com/${{ github.repository }}-public
git push -f public main
7 changes: 5 additions & 2 deletions .github/workflows/_pystats.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Generated file: !!! DO NOT EDIT !!!
---
env:
PYPERFORMANCE_HASH: ebb37f3583e26ea22cee34126b3b8a815112370b
PYSTON_BENCHMARKS_HASH: 004743ccbd9e54598c543d7eb71fd3b8e10d5750
PYPERFORMANCE_HASH: 9164273e5504c410a5be08d8753c91be708fdd9a
PYSTON_BENCHMARKS_HASH: 265655e7f03ace13ec1e00e1ba299179e69f8a00
name: _pystats
on:
workflow_dispatch:
Expand Down Expand Up @@ -86,6 +86,7 @@ jobs:
- name: Checkout CPython
uses: actions/checkout@v4
with:
persist-credentials: false
repository: ${{ inputs.fork }}/cpython
ref: ${{ inputs.ref }}
path: cpython
Expand All @@ -104,13 +105,15 @@ jobs:
uses: actions/checkout@v4
if: ${{ steps.should_run.outputs.should_run != 'false' }}
with:
persist-credentials: false
repository: pyston/python-macrobenchmarks
path: pyston-benchmarks
ref: ${{ env.PYSTON_BENCHMARKS_HASH }}
- name: Checkout pyperformance
uses: actions/checkout@v4
if: ${{ steps.should_run.outputs.should_run != 'false' }}
with:
persist-credentials: false
repository: mdboom/pyperformance
path: pyperformance
ref: ${{ env.PYPERFORMANCE_HASH }}
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/_weekly.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Generated file: !!! DO NOT EDIT !!!
---
env:
PYPERFORMANCE_HASH: ebb37f3583e26ea22cee34126b3b8a815112370b
PYSTON_BENCHMARKS_HASH: 004743ccbd9e54598c543d7eb71fd3b8e10d5750
PYPERFORMANCE_HASH: 9164273e5504c410a5be08d8753c91be708fdd9a
PYSTON_BENCHMARKS_HASH: 265655e7f03ace13ec1e00e1ba299179e69f8a00
name: _weekly
on:
schedule:
Expand All @@ -20,6 +20,7 @@ jobs:
- name: Checkout CPython
uses: actions/checkout@v4
with:
persist-credentials: false
repository: python/cpython
path: cpython
ref: main
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Generated file: !!! DO NOT EDIT !!!
---
env:
PYPERFORMANCE_HASH: ebb37f3583e26ea22cee34126b3b8a815112370b
PYSTON_BENCHMARKS_HASH: 004743ccbd9e54598c543d7eb71fd3b8e10d5750
PYPERFORMANCE_HASH: 9164273e5504c410a5be08d8753c91be708fdd9a
PYSTON_BENCHMARKS_HASH: 265655e7f03ace13ec1e00e1ba299179e69f8a00
name: benchmark
run-name: benchmarking ${{ inputs.fork }}/${{ inputs.ref }} ${{ inputs.tier2 == true
&& 'T2' || '' }} ${{ inputs.jit == true && 'JIT' || '' }} ${{ inputs.nogil == true
Expand Down Expand Up @@ -63,6 +63,8 @@ jobs:
steps:
- name: Checkout benchmarking
uses: actions/checkout@v4
with:
persist-credentials: false
- name: Setup system Python
uses: actions/setup-python@v5
with:
Expand All @@ -71,6 +73,7 @@ jobs:
- name: Checkout CPython
uses: actions/checkout@v4
with:
persist-credentials: false
repository: ${{ inputs.fork }}/cpython
path: cpython
ref: ${{ inputs.ref }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Generated file: !!! DO NOT EDIT !!!
---
env:
PYPERFORMANCE_HASH: ebb37f3583e26ea22cee34126b3b8a815112370b
PYSTON_BENCHMARKS_HASH: 004743ccbd9e54598c543d7eb71fd3b8e10d5750
PYPERFORMANCE_HASH: 9164273e5504c410a5be08d8753c91be708fdd9a
PYSTON_BENCHMARKS_HASH: 265655e7f03ace13ec1e00e1ba299179e69f8a00
name: ci
on:
pull_request:
Expand Down

0 comments on commit a3cd4f6

Please sign in to comment.