Skip to content

Commit

Permalink
merge: main -> mntor-4065
Browse files Browse the repository at this point in the history
  • Loading branch information
flozia committed Feb 24, 2025
2 parents b8bd65d + 2b56c1b commit b1b269a
Show file tree
Hide file tree
Showing 37 changed files with 6,592 additions and 7,336 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '20.9.x'
node-version: '20.18.x'
- run: npm ci
- run: npm run build-glean
# Verify that the build (incl. type-checking) succeeds
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e_cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20.9.x
node-version: 20.18.x

- name: Install dependencies
run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e_pr_full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20.9.x
node-version: 20.18.x

- name: Install dependencies
run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e_pr_smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20.9.x
node-version: 20.18.x

- name: Install dependencies
run: npm ci
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lighthouse_cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
id-token: write
steps:
- uses: actions/checkout@v4
- name: Use Node.js 20.9.x
- name: Use Node.js 20.18.x
uses: actions/setup-node@v4
with:
node-version: 20.9.x
node-version: 20.18.x
- name: Run Lighthouse CI
run: |
npm install -g @lhci/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '20.9.x'
node-version: '20.18.x'
- run: npm ci
- run: npm run build-glean
- run: npm run build-nimbus
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unittests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: '20.9.x'
node-version: '20.18.x'
- run: npm ci
- run: npm run build-glean
# Run the regular tests on push
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20.9-alpine
FROM node:20.18-alpine

RUN addgroup -g 10001 app && \
adduser -D -G app -h /app -u 10001 app
Expand Down Expand Up @@ -41,4 +41,4 @@ RUN --mount=type=secret,id=SENTRY_AUTH_TOKEN,env=SENTRY_AUTH_TOKEN \
GLEAN_PIP=pip \
npm run build

CMD ["npm", "start"]
CMD ["npm", "start"]
7 changes: 5 additions & 2 deletions esbuild.cronjobs.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@ import { build } from "esbuild";
// own issues in Next.js. Thus, esbuild is a compromise that can resolve these
// import specifiers for us.
build({
entryPoints: ["./src/scripts/cronjobs/**/*.tsx", "./src/scripts/cronjobs/**/*.ts"],
entryPoints: [
"./src/scripts/cronjobs/**/*.tsx",
"./src/scripts/cronjobs/**/*.ts",
],
tsconfig: "tsconfig.cronjobs.json",
bundle: true,
platform: "node",
format: "esm",
outdir: "dist/scripts/cronjobs/",
sourcemap: true,
target: "node20.9",
target: "node20.18",
packages: "external",
});
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
# Default build command.
command = "npm ci; npm run build-storybook"

environment = { NODE_VERSION = "20.9.0", NPM_VERSION = "10.1.0" }
environment = { NODE_VERSION = "20.18.2", NPM_VERSION = "10.1.0" }
Loading

0 comments on commit b1b269a

Please sign in to comment.