Skip to content

Commit 516c061

Browse files
author
Alan
committed
merge: resolve conflict in workflow file
2 parents f8664eb + 59529a8 commit 516c061

File tree

4 files changed

+19422
-2561
lines changed

4 files changed

+19422
-2561
lines changed
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
21
name: Self-Hosted CI
32

43
on:
54
push:
65
branches: [ main ]
76
pull_request:
87
branches: [ main ]
8+
# Ajout d'un déclencheur manuel pour faciliter les tests
99
workflow_dispatch:
1010

1111
jobs:
1212
build-and-test:
13+
# Spécifie d'utiliser votre runner auto-hébergé au lieu des runners GitHub
1314
runs-on: self-hosted
1415

1516
steps:
@@ -19,10 +20,10 @@ jobs:
1920
- name: Log Node.js version
2021
run: node --version
2122

22-
# ÉTAPE SUPPRIMÉE - pas critique pour le TP
23+
# ÉTAPE SUPPRIMÉE - pas critique pour le TP (df -h ne marche pas sur Windows)
2324

2425
- name: Install dependencies
25-
run: npm install
26+
run: npm ci --legacy-peer-deps
2627

2728
- name: Run tests
28-
run: npm test -- --watch=false --browsers=ChromeHeadless --no-progress
29+
run: npm test -- --watch=false --browsers=ChromeHeadless --no-progress

0 commit comments

Comments
 (0)