Skip to content

Commit df171a2

Browse files
authored
Merge pull request #1946 from openwebwork/WeBWorK-2.18
WeBWorK 2.18
2 parents 65073f9 + f5c747e commit df171a2

File tree

888 files changed

+149284
-125302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

888 files changed

+149284
-125302
lines changed

.github/workflows/linter.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
name: Lint Code Base
3+
4+
defaults:
5+
run:
6+
shell: bash
7+
8+
on:
9+
push:
10+
branches-ignore: [main, develop]
11+
pull_request:
12+
13+
jobs:
14+
perltidy:
15+
name: Run perltidy on Perl Files
16+
runs-on: ubuntu-22.04
17+
container:
18+
image: perl:5.34
19+
steps:
20+
- uses: actions/checkout@v3
21+
- name: perl -V
22+
run: perl -V
23+
- name: Install dependencies
24+
run: cpanm -n Perl::Tidy@20220613
25+
- name: perltidy --version
26+
run: perltidy --version
27+
- name: Run perltidy
28+
shell: bash
29+
run: |
30+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
31+
shopt -s extglob globstar nullglob
32+
perltidy --pro=./.perltidyrc -b -bext='/' ./**/*.p[lm] ./**/*.t && git diff --exit-code

.gitignore

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
.env
2-
docker-compose.yml
3-
tmp
42
*~
5-
!tmp/README
6-
!htdocs/tmp/README
3+
*.swp
74
*.save
8-
htdocs/tmp/*
5+
*.bak
96
tmp/*
107
logs/*
11-
!logs/README
12-
conf/*.conf
13-
conf/*-config
8+
9+
conf/*
10+
!conf/*.dist*
11+
!conf/*.config
12+
13+
node_modules
14+
15+
htdocs/tmp/*
1416
htdocs/site_info.txt
1517
htdocs/DATA/*
16-
node_modules
17-
node_modules/*
18-
math4-overrides.css
19-
math4-overrides.js
18+
htdocs/themes/*/math4-overrides.css
19+
htdocs/themes/*/math4-overrides.js
2020
htdocs/static-assets.json
21+
htdocs/index.html
2122
htdocs/**/*.min.js
2223
htdocs/**/*.min.css
2324
htdocs/themes/*/images/*
24-
!htdocs/themes/*/images/maa_logo.png
25+
!htdocs/themes/*/images/maa_logo.svg
2526
!htdocs/themes/*/images/webwork_logo.svg
2627
!htdocs/themes/math4/images/webwork_square.svg
2728
htdocs/themes/*/*.css
@@ -30,5 +31,16 @@ htdocs/themes/*
3031
!htdocs/themes/math4-red
3132
!htdocs/themes/math4-green
3233
!htdocs/themes/math4-yellow
34+
!htdocs/themes/layouts
35+
3336
DATA/*
34-
*.swp
37+
!DATA/uploads
38+
DATA/uploads/*
39+
!*README*
40+
41+
docker-compose.yml
42+
docker-config/ssl/*
43+
!docker-config/ssl/Readme
44+
45+
.vscode
46+
.vim

.perltidyrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@
2020
-nlop # No logical padding (this causes mixed tabs and spaces)
2121
-wn # Weld nested containers
2222
-xci # Extended continuation indentation
23+
-vxl='q' # No vertical alignment of qw quotes

0 commit comments

Comments
 (0)