Skip to content

Commit 9c51709

Browse files
adamtasteslikegoodadamtasteslikegood
authored
Merge branch 'main' into cyrus/tas-8-pytest-failing-for-pr67
2 parents 573b2ce + 9f8cbe9 commit 9c51709

13 files changed

Lines changed: 61 additions & 61 deletions

‎.github/workflows/ci-cd-backend.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
name: Install & pytest
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@v6
21+
- uses: actions/checkout@v4
2222
with:
2323
submodules: recursive
24-
- uses: actions/setup-python@v6
24+
- uses: actions/setup-python@v5
2525
with:
2626
python-version: '3.12'
2727
- uses: astral-sh/setup-uv@v7

‎.github/workflows/ci-cd.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
name: Install dependencies
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v6
22+
- uses: actions/checkout@v4
2323
with:
2424
submodules: recursive
25-
- uses: actions/setup-node@v6
25+
- uses: actions/setup-node@v4
2626
with:
2727
node-version: '20'
2828
cache: npm
2929
- run: npm ci
30-
- uses: actions/cache@v5
30+
- uses: actions/cache@v4
3131
with:
3232
path: node_modules
3333
key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}
@@ -37,12 +37,12 @@ jobs:
3737
needs: [install]
3838
runs-on: ubuntu-latest
3939
steps:
40-
- uses: actions/checkout@v6
41-
- uses: actions/setup-node@v6
40+
- uses: actions/checkout@v4
41+
- uses: actions/setup-node@v4
4242
with:
4343
node-version: '20'
4444
cache: npm
45-
- uses: actions/cache@v5
45+
- uses: actions/cache@v4
4646
with:
4747
path: node_modules
4848
key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json') }}

‎.github/workflows/ci.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020

2121
steps:
2222
- name: Checkout code
23-
uses: actions/checkout@v6
23+
uses: actions/checkout@v4
2424
with:
2525
token: ${{ secrets.GITHUB_TOKEN }}
2626

2727
- name: Setup Node.js
28-
uses: actions/setup-node@v6
28+
uses: actions/setup-node@v4
2929
with:
3030
node-version: '20'
3131
cache: 'npm'
@@ -52,10 +52,10 @@ jobs:
5252

5353
steps:
5454
- name: Checkout code
55-
uses: actions/checkout@v6
55+
uses: actions/checkout@v4
5656

5757
- name: Setup Node.js
58-
uses: actions/setup-node@v6
58+
uses: actions/setup-node@v4
5959
with:
6060
node-version: '20'
6161
cache: 'npm'
@@ -67,7 +67,7 @@ jobs:
6767
run: npm run build
6868

6969
- name: Archive production artifacts
70-
uses: actions/upload-artifact@v7
70+
uses: actions/upload-artifact@v4
7171
with:
7272
name: dist
7373
path: |
@@ -81,10 +81,10 @@ jobs:
8181

8282
steps:
8383
- name: Checkout code
84-
uses: actions/checkout@v6
84+
uses: actions/checkout@v4
8585

8686
- name: Setup Node.js
87-
uses: actions/setup-node@v6
87+
uses: actions/setup-node@v4
8888
with:
8989
node-version: '20'
9090
cache: 'npm'
@@ -104,10 +104,10 @@ jobs:
104104

105105
steps:
106106
- name: Checkout code
107-
uses: actions/checkout@v6
107+
uses: actions/checkout@v4
108108

109109
- name: Setup Node.js
110-
uses: actions/setup-node@v6
110+
uses: actions/setup-node@v4
111111
with:
112112
node-version: '20'
113113
cache: 'npm'
@@ -120,7 +120,7 @@ jobs:
120120

121121
- name: Upload coverage reports
122122
if: always()
123-
uses: actions/upload-artifact@v7
123+
uses: actions/upload-artifact@v4
124124
with:
125125
name: coverage
126126
path: coverage/
@@ -132,10 +132,10 @@ jobs:
132132

133133
steps:
134134
- name: Checkout code
135-
uses: actions/checkout@v6
135+
uses: actions/checkout@v4
136136

137137
- name: Setup Node.js
138-
uses: actions/setup-node@v6
138+
uses: actions/setup-node@v4
139139
with:
140140
node-version: '20'
141141
cache: 'npm'

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches: [main]
66
pull_request:
7-
branches: [main, develop]
7+
branches: [main, dev]
88
schedule:
99
# Run weekly on Monday at 06:00 UTC to catch new CVEs
1010
- cron: '0 6 * * 1'
@@ -29,7 +29,7 @@ jobs:
2929

3030
steps:
3131
- name: Checkout code
32-
uses: actions/checkout@v6
32+
uses: actions/checkout@v4
3333

3434
- name: Initialize CodeQL
3535
uses: github/codeql-action/init@v4

‎.github/workflows/dependabot-automerge.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- name: Fetch Dependabot metadata
1919
id: metadata
20-
uses: dependabot/fetch-metadata@v3
20+
uses: dependabot/fetch-metadata@v2
2121
with:
2222
github-token: ${{ secrets.GITHUB_TOKEN }}
2323

@@ -40,7 +40,7 @@ jobs:
4040

4141
- name: Enable auto-merge (squash)
4242
if: steps.metadata.outputs.update-type != 'version-update:semver-major'
43-
uses: actions/github-script@v9
43+
uses: actions/github-script@v7
4444
with:
4545
github-token: ${{ secrets.GITHUB_TOKEN }}
4646
script: |

‎.github/workflows/dependency-review.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Dependency Review
22

33
on:
44
pull_request:
5-
branches: [main, develop]
5+
branches: [main, dev]
66

77
permissions:
88
contents: read
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- name: Checkout code
18-
uses: actions/checkout@v6
18+
uses: actions/checkout@v4
1919

2020
- name: Dependency Review
2121
uses: actions/dependency-review-action@v4

‎.github/workflows/dependency-submission.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Dependency Submission
22

33
on:
44
push:
5-
branches: [main, develop]
5+
branches: [main, dev]
66
pull_request:
7-
branches: [main, develop]
7+
branches: [main, dev]
88

99
permissions:
1010
contents: read
@@ -17,10 +17,10 @@ jobs:
1717

1818
steps:
1919
- name: Checkout code
20-
uses: actions/checkout@v6
20+
uses: actions/checkout@v4
2121

2222
- name: Setup Node.js
23-
uses: actions/setup-node@v6
23+
uses: actions/setup-node@v4
2424
with:
2525
node-version: '20'
2626
cache: 'npm'

‎.github/workflows/gc-build-deploy.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
id: detect
3333
env:
3434
AUTHORIZED_DEPLOYERS: ${{ vars.AUTHORIZED_DEPLOYERS }}
35-
uses: actions/github-script@v9
35+
uses: actions/github-script@v7
3636
with:
3737
script: |
3838
const owner = (context.payload.repository?.owner?.login || context.repo.owner).toLowerCase();
@@ -109,7 +109,7 @@ jobs:
109109
steps:
110110
- name: Create versioned backup release from previous default-branch commit
111111
id: backup
112-
uses: actions/github-script@v9
112+
uses: actions/github-script@v7
113113
with:
114114
script: |
115115
const triggerMode = '${{ needs.detect-trigger.outputs.trigger_mode }}';
@@ -167,8 +167,8 @@ jobs:
167167
build_status: ${{ steps.run.outputs.build_status }}
168168
notes: ${{ steps.run.outputs.notes }}
169169
steps:
170-
- uses: actions/checkout@v6
171-
- uses: actions/setup-node@v6
170+
- uses: actions/checkout@v4
171+
- uses: actions/setup-node@v4
172172
with:
173173
node-version: 20
174174
cache: npm
@@ -235,7 +235,7 @@ jobs:
235235
build_status: ${{ steps.audit.outputs.build_status }}
236236
notes: ${{ steps.audit.outputs.notes }}
237237
steps:
238-
- uses: actions/checkout@v6
238+
- uses: actions/checkout@v4
239239
with:
240240
submodules: recursive
241241
- name: Audit backend submodule availability
@@ -276,7 +276,7 @@ jobs:
276276
GCP_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
277277
GCP_SERVICE_ACCOUNT: ${{ secrets.GCP_SERVICE_ACCOUNT }}
278278
steps:
279-
- uses: actions/checkout@v6
279+
- uses: actions/checkout@v4
280280
- name: Validate deployment prerequisites
281281
id: prep
282282
continue-on-error: true
@@ -342,7 +342,7 @@ jobs:
342342
CLOUD_RUN_SERVICE: ${{ vars.CLOUD_RUN_SERVICE || 'vegangenius-chef' }}
343343
CLOUD_BUILD_COMMAND: ${{ needs.pre-deploy-gate.outputs.cloud_build_command }}
344344
steps:
345-
- uses: actions/checkout@v6
345+
- uses: actions/checkout@v4
346346
with:
347347
submodules: recursive
348348
- uses: google-github-actions/auth@v3
@@ -389,7 +389,7 @@ jobs:
389389
if: always() && needs.detect-trigger.outputs.should_run == 'true'
390390
runs-on: ubuntu-latest
391391
steps:
392-
- uses: actions/checkout@v6
392+
- uses: actions/checkout@v4
393393
- name: Render report from template
394394
env:
395395
TRIGGER_MODE: ${{ needs.detect-trigger.outputs.trigger_mode }}
@@ -456,7 +456,7 @@ jobs:
456456
raise SystemExit(1) from exc
457457
PY
458458
cat gc-build-deploy-status-report.md >> "$GITHUB_STEP_SUMMARY"
459-
- uses: actions/upload-artifact@v7
459+
- uses: actions/upload-artifact@v4
460460
with:
461461
name: gc-build-deploy-status-report
462462
path: gc-build-deploy-status-report.md
@@ -473,7 +473,7 @@ jobs:
473473
runs-on: ubuntu-latest
474474
steps:
475475
- name: Update associated PR labels and comment
476-
uses: actions/github-script@v9
476+
uses: actions/github-script@v7
477477
env:
478478
TRIGGER_MODE: ${{ needs.detect-trigger.outputs.trigger_mode }}
479479
FRONTEND_RESULT: ${{ needs.frontend-ci.result }}

‎.github/workflows/pr-gate.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
name: Frontend — lint + format
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v6
28-
- uses: actions/setup-node@v6
27+
- uses: actions/checkout@v4
28+
- uses: actions/setup-node@v4
2929
with:
3030
node-version: '20'
3131
cache: npm
@@ -37,8 +37,8 @@ jobs:
3737
name: Frontend — TypeScript
3838
runs-on: ubuntu-latest
3939
steps:
40-
- uses: actions/checkout@v6
41-
- uses: actions/setup-node@v6
40+
- uses: actions/checkout@v4
41+
- uses: actions/setup-node@v4
4242
with:
4343
node-version: '20'
4444
cache: npm
@@ -50,14 +50,14 @@ jobs:
5050
name: Frontend — build
5151
runs-on: ubuntu-latest
5252
steps:
53-
- uses: actions/checkout@v6
54-
- uses: actions/setup-node@v6
53+
- uses: actions/checkout@v4
54+
- uses: actions/setup-node@v4
5555
with:
5656
node-version: '20'
5757
cache: npm
5858
- run: npm ci
5959
- run: npm run build
60-
- uses: actions/upload-artifact@v7
60+
- uses: actions/upload-artifact@v4
6161
with:
6262
name: dist-${{ github.sha }}
6363
path: |
@@ -69,16 +69,16 @@ jobs:
6969
name: Frontend — unit tests + coverage
7070
runs-on: ubuntu-latest
7171
steps:
72-
- uses: actions/checkout@v6
73-
- uses: actions/setup-node@v6
72+
- uses: actions/checkout@v4
73+
- uses: actions/setup-node@v4
7474
with:
7575
node-version: '20'
7676
cache: npm
7777
- run: npm ci
7878
# Coverage thresholds are enforced by vitest.config.ts:
7979
# lines/stmts ≥ 60%, branches ≥ 50%, functions ≥ 40%
8080
- run: npm run test:ci
81-
- uses: actions/upload-artifact@v7
81+
- uses: actions/upload-artifact@v4
8282
if: always()
8383
with:
8484
name: coverage-${{ github.sha }}
@@ -91,10 +91,10 @@ jobs:
9191
name: Backend — pytest
9292
runs-on: ubuntu-latest
9393
steps:
94-
- uses: actions/checkout@v6
94+
- uses: actions/checkout@v4
9595
with:
9696
submodules: recursive
97-
- uses: actions/setup-python@v6
97+
- uses: actions/setup-python@v5
9898
with:
9999
python-version: '3.12'
100100
- uses: astral-sh/setup-uv@v7
@@ -111,7 +111,7 @@ jobs:
111111
name: CHANGELOG entry for this version
112112
runs-on: ubuntu-latest
113113
steps:
114-
- uses: actions/checkout@v6
114+
- uses: actions/checkout@v4
115115
- name: Verify CHANGELOG.md has an entry for package.json version
116116
run: |
117117
VERSION=$(node -p "require('./package.json').version")

‎.github/workflows/qodana_code_quality.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
if: ${{ env.QODANA_TOKEN == '' }}
2323
run: echo "::notice::QODANA_TOKEN is not available (expected for dependabot or fork PRs). Skipping Qodana scan."
2424

25-
- uses: actions/checkout@v6
25+
- uses: actions/checkout@v4
2626
if: ${{ env.QODANA_TOKEN != '' }}
2727
with:
2828
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}

0 commit comments

Comments
 (0)