Skip to content

Commit 2d0b653

Browse files
authored
Merge branch 'bfops/smoketest-flakes' into bfops/public-test-flakes
2 parents 4c62089 + a740b0d commit 2d0b653

101 files changed

Lines changed: 2086 additions & 550 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.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Set up pnpm
2+
description: Install pnpm and configure repository package-age policy before any install
3+
inputs:
4+
run_install:
5+
description: Run pnpm install after configuring pnpm
6+
required: false
7+
default: "false"
8+
runs:
9+
using: composite
10+
steps:
11+
- uses: pnpm/action-setup@v4
12+
13+
- name: Configure pnpm package age policy
14+
shell: bash
15+
run: pnpm config set --global minimumReleaseAge 1440
16+
17+
- name: Install dependencies
18+
if: inputs.run_install == 'true'
19+
shell: bash
20+
run: pnpm install

.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:

.github/workflows/ci.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
with:
8181
node-version: 18
8282

83-
- uses: pnpm/action-setup@v4
83+
- uses: ./.github/actions/setup-pnpm
8484
with:
8585
run_install: true
8686

@@ -221,7 +221,7 @@ jobs:
221221
with:
222222
node-version: 22
223223

224-
- uses: pnpm/action-setup@v4
224+
- uses: ./.github/actions/setup-pnpm
225225
with:
226226
run_install: true
227227

@@ -297,7 +297,7 @@ jobs:
297297
with:
298298
node-version: 22
299299

300-
- uses: pnpm/action-setup@v4
300+
- uses: ./.github/actions/setup-pnpm
301301
with:
302302
run_install: true
303303

@@ -524,7 +524,7 @@ jobs:
524524
with:
525525
node-version: 22
526526

527-
- uses: pnpm/action-setup@v4
527+
- uses: ./.github/actions/setup-pnpm
528528
with:
529529
run_install: true
530530

@@ -689,12 +689,6 @@ jobs:
689689
key: Unity-${{ github.head_ref }}
690690
restore-keys: Unity-
691691

692-
- name: Login to DockerHub
693-
uses: docker/login-action@v2
694-
with:
695-
username: ${{ vars.DOCKERHUB_USERNAME }}
696-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
697-
698692
- name: Run Unity tests
699693
uses: game-ci/unity-test-runner@v4
700694
with:
@@ -1063,7 +1057,7 @@ jobs:
10631057
with:
10641058
node-version: '22'
10651059

1066-
- uses: pnpm/action-setup@v4
1060+
- uses: ./.github/actions/setup-pnpm
10671061
with:
10681062
run_install: true
10691063

@@ -1100,7 +1094,7 @@ jobs:
11001094
with:
11011095
node-version: 22
11021096

1103-
- uses: pnpm/action-setup@v4
1097+
- uses: ./.github/actions/setup-pnpm
11041098
with:
11051099
run_install: true
11061100

@@ -1212,7 +1206,7 @@ jobs:
12121206
uses: actions/setup-node@v4
12131207
with:
12141208
node-version: 20
1215-
- uses: pnpm/action-setup@v4
1209+
- uses: ./.github/actions/setup-pnpm
12161210
with:
12171211
run_install: true
12181212
- name: Verify that upgrade-version still works

.github/workflows/docker.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ jobs:
4040
uses: docker/login-action@v2
4141
with:
4242
username: ${{ vars.DOCKERHUB_USERNAME }}
43-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
43+
# Docker Hub access tokens are passed to docker/login-action via the password input.
44+
password: ${{ secrets.DOCKERHUB_TOKEN }}
4445
- name: Build and push
4546
uses: docker/build-push-action@v4
4647
with:
@@ -101,7 +102,8 @@ jobs:
101102
uses: docker/login-action@v2
102103
with:
103104
username: ${{ vars.DOCKERHUB_USERNAME }}
104-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
105+
# Docker Hub access tokens are passed to docker/login-action via the password input.
106+
password: ${{ secrets.DOCKERHUB_TOKEN }}
105107
- name: Build and push
106108
uses: docker/build-push-action@v4
107109
with:

.github/workflows/docs-publish.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
with:
2121
node-version: '22'
2222

23-
- uses: pnpm/action-setup@v4
23+
- uses: ./.github/actions/setup-pnpm
2424
with:
2525
run_install: true
2626

.github/workflows/docs-update-llms.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
node-version: '22'
2828

29-
- uses: pnpm/action-setup@v4
29+
- uses: ./.github/actions/setup-pnpm
3030
with:
3131
run_install: true
3232

.github/workflows/llm-benchmark-periodic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
node-version: 22
7171

7272
- name: Install pnpm
73-
uses: pnpm/action-setup@v4
73+
uses: ./.github/actions/setup-pnpm
7474

7575
- name: Build llm-benchmark tool
7676
run: cargo install --path tools/xtask-llm-benchmark --locked

.github/workflows/llm-benchmark-validate-goldens.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565

6666
- name: Install pnpm
6767
if: matrix.lang == 'typescript'
68-
uses: pnpm/action-setup@v4
68+
uses: ./.github/actions/setup-pnpm
6969

7070
- name: Build llm-benchmark tool
7171
run: cargo install --path tools/xtask-llm-benchmark --locked

.github/workflows/package.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,11 @@ jobs:
142142
run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
143143
id: extract_branch
144144

145-
- name: Upload to DO Spaces
145+
- name: Upload to AWS S3
146146
uses: shallwefootball/s3-upload-action@master
147147
with:
148148
aws_key_id: ${{ secrets.AWS_KEY_ID }}
149149
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
150150
aws_bucket: ${{ vars.AWS_BUCKET }}
151151
source_dir: build
152-
endpoint: https://nyc3.digitaloceanspaces.com
153152
destination_dir: ${{ steps.extract_branch.outputs.branch }}

0 commit comments

Comments
 (0)