Skip to content

Commit 08a76ac

Browse files
authored
More supply chain attack mitigations (#531)
* remove duplicate dependabot config * update nixpkgs ref * explicitly use '--ignore-scripts' argument during `pnpm install`
1 parent 0b738e6 commit 08a76ac

File tree

7 files changed

+31
-38
lines changed

7 files changed

+31
-38
lines changed

.github/dependabot.yaml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
5+
16
version: 2
27
updates:
3-
- package-ecosystem: npm
4-
directory: "/"
5-
schedule:
6-
interval: weekly
7-
day: sunday
8-
time: "00:00"
9-
cooldown:
10-
default-days: 7
11-
open-pull-requests-limit: 20
12-
versioning-strategy: increase
8+
- package-ecosystem: npm
9+
directory: '/'
10+
schedule:
11+
interval: weekly
12+
day: sunday
13+
time: '00:00'
14+
cooldown:
15+
default-days: 7
16+
open-pull-requests-limit: 20
17+
versioning-strategy: increase

.github/dependabot.yml

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

.github/workflows/build-and-lint-on-pr.yaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,27 @@ jobs:
1212
uses: actions/checkout@v4
1313

1414
- name: Set up pnpm
15-
uses: pnpm/action-setup@v4
15+
uses: pnpm/action-setup@v4.2.0
1616
with:
17-
version: 9
17+
version: 10
1818
run_install: false
1919

2020
- name: Set up node
21-
uses: actions/setup-node@v4
21+
uses: actions/setup-node@v6
2222
with:
2323
node-version: 20
2424
cache: 'pnpm'
2525

2626
- name: Install dependencies
27-
run: pnpm install
28-
27+
run: pnpm install --ignore-scripts
28+
2929
- name: Build application
30-
run: pnpm run build
30+
run: |
31+
pnpm prepare
32+
pnpm run build
3133
3234
- name: Check for ESLint warnings and errors
3335
run: pnpm run lint
34-
36+
3537
- name: Run tests
3638
run: pnpm run tests

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ RUN apk add pnpm
44

55
COPY . .
66

7-
RUN pnpm install
7+
RUN pnpm install --ignore-scripts
8+
RUN pnpm prepare
89
RUN pnpm run build
910
# Delete node_modules that contain dev deps and only install runtime deps
1011
# in the version that is copied to the final output

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ help:
88

99
.PHONY: build
1010
build: ## Build the app
11-
pnpm install
11+
pnpm install --ignore-scripts
1212

1313
.PHONY: run-dev
1414
run-dev: ## Run the app in dev mode

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
outputs = inputs @ {flake-parts, ...}:
1010
flake-parts.lib.mkFlake {inherit inputs;} {
1111
systems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin"];
12-
perSystem = {
13-
pkgs,
14-
self',
15-
...
16-
}: {
12+
perSystem = {pkgs, ...}: {
1713
devShells.default = pkgs.mkShell {
1814
shellHook = ''
1915
export DAPLA_TEAM_API_URL=https://dapla-team-api.intern.test.ssb.no

0 commit comments

Comments
 (0)