Skip to content

Commit faa08c4

Browse files
Merge remote-tracking branch 'origin/master' into MAST1999/master
# Conflicts: # pnpm-lock.yaml
2 parents 7056b02 + cb92b6f commit faa08c4

539 files changed

Lines changed: 33274 additions & 5068 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ LICENSE.txt @cloutiertyler
77

88
/crates/cli/src/ @bfops @cloutiertyler @jdetter
99
/tools/ci/ @bfops @cloutiertyler @jdetter
10+
/tools/ci/src/keynote_bench.rs @joshua-spacetime @cloutiertyler @jdetter
1011
/tools/upgrade-version/ @bfops @jdetter @cloutiertyler
1112
/tools/license-check/ @bfops @jdetter @cloutiertyler
1213
/.github/ @bfops @jdetter @cloutiertyler

.github/docker-compose.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

.github/workflows/attach-artifacts.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
- name: Checkout
1818
uses: actions/checkout@v4
1919

20-
- name: Download artifacts from private base URL
20+
- name: Download artifacts from AWS base URL
2121
env:
2222
RELEASE_TAG: ${{ github.event.inputs.release_tag }}
23-
BASE_URL: ${{ secrets.ARTIFACT_BASE_URL }}
23+
BASE_URL: https://${{ vars.AWS_BUCKET }}.s3.amazonaws.com/refs/tags
2424
run: |
2525
set -euo pipefail
2626

.github/workflows/benchmarks.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ on:
22
push:
33
branches:
44
- master
5-
- jgilles/fix-callgrind-again
65

76
workflow_dispatch:
87
inputs:
@@ -24,8 +23,10 @@ jobs:
2423
benchmark:
2524
name: run criterion benchmarks
2625
runs-on: benchmarks-runner
26+
# disable until we fix the benchmarks
27+
if: false
2728
# filter for a comment containing 'benchmarks please'
28-
if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }}
29+
#if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }}
2930
env:
3031
PR_NUMBER: ${{ github.event.inputs.pr_number || github.event.issue.number || null }}
3132
steps:
@@ -185,8 +186,10 @@ jobs:
185186
container:
186187
image: rust:1.93.0
187188
options: --privileged
189+
# disable until we fix the benchmarks
190+
if: false
188191
# filter for a comment containing 'benchmarks please'
189-
if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }}
192+
#if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }}
190193
env:
191194
PR_NUMBER: ${{ github.event.inputs.pr_number || github.event.issue.number || null }}
192195
steps:

0 commit comments

Comments
 (0)