Skip to content

Commit 757a89b

Browse files
authored
Merge branch 'main' into feature/lab4
2 parents 4f378e0 + 1564bab commit 757a89b

8 files changed

Lines changed: 785 additions & 1 deletion

File tree

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
## Goal
2+
A brief description of what this PR adds or fixes (1 sentence).
3+
4+
## Changes
5+
- List of changes
6+
7+
## Testing
8+
- [ ] Description of how the functionality was tested locally (e.g., running `curl 127.0.0.1:3000`).
9+
10+
## Artifacts & Screenshots
11+
- Links to files or screenshots (if necessary).
12+
13+
## Checklist
14+
- [ ] Title is clear (feat(labN): <topic> style)
15+
- [ ] No secrets/large temp files committed
16+
- [ ] Submission file at submissions/labN.md exists

.github/workflows/lab1-smoke.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Lab 1 Smoke Test
2+
3+
on:
4+
pull_request:
5+
branches: [ main ]
6+
7+
# pipeline only reads code
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
smoke-test:
13+
runs-on: ubuntu-latest
14+
15+
services:
16+
juice-shop:
17+
image: bkimminich/juice-shop:v20.0.0
18+
ports:
19+
- 3000:3000
20+
21+
steps:
22+
- name: Checkout repository
23+
uses: actions/checkout@v4
24+
25+
26+
- name: Wait for Juice Shop to be started
27+
run: |
28+
echo "Waiting for Juice Shop to start..."
29+
for i in $(seq 1 30); do
30+
curl --silent --fail http://localhost:3000/rest/admin/application-version >/dev/null && echo "Ready!" && exit 0
31+
sleep 2
32+
done
33+
echo "Timeout!"
34+
exit 1
35+
36+
37+
- name: Smoke Test (Curl Homepage)
38+
run: curl -I http://localhost:3000

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ repos:
1010
hooks:
1111
- id: detect-private-key
1212
- id: check-added-large-files
13-
args: ['--maxkb=5000']
13+
args: ['--maxkb=5000']

0 commit comments

Comments
 (0)