Merge pull request #1946 from openwebwork/WeBWorK-2.18

WeBWorK 2.18

.github/workflows/linter.yml

@@ -0,0 +1,32 @@
+---
+name: Lint Code Base
+
+defaults:
+  run:
+    shell: bash
+
+on:
+  push:
+    branches-ignore: [main, develop]
+  pull_request:
+
+jobs:
+  perltidy:
+    name: Run perltidy on Perl Files
+    runs-on: ubuntu-22.04
+    container:
+      image: perl:5.34
+    steps:
+      - uses: actions/checkout@v3
+      - name: perl -V
+        run: perl -V
+      - name: Install dependencies
+        run: cpanm -n Perl::Tidy@20220613
+      - name: perltidy --version
+        run: perltidy --version
+      - name: Run perltidy
+        shell: bash
+        run: |
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          shopt -s extglob globstar nullglob
+          perltidy --pro=./.perltidyrc -b -bext='/' ./**/*.p[lm] ./**/*.t && git diff --exit-code

.gitignore

@@ -1,27 +1,28 @@
 .env
-docker-compose.yml
-tmp
 *~
-!tmp/README
-!htdocs/tmp/README
+*.swp
 *.save
-htdocs/tmp/*
+*.bak
 tmp/*
 logs/*
-!logs/README
-conf/*.conf
-conf/*-config
+
+conf/*
+!conf/*.dist*
+!conf/*.config
+
+node_modules
+
+htdocs/tmp/*
 htdocs/site_info.txt
 htdocs/DATA/*
-node_modules
-node_modules/*
-math4-overrides.css
-math4-overrides.js
+htdocs/themes/*/math4-overrides.css
+htdocs/themes/*/math4-overrides.js
 htdocs/static-assets.json
+htdocs/index.html
 htdocs/**/*.min.js
 htdocs/**/*.min.css
 htdocs/themes/*/images/*
-!htdocs/themes/*/images/maa_logo.png
+!htdocs/themes/*/images/maa_logo.svg
 !htdocs/themes/*/images/webwork_logo.svg
 !htdocs/themes/math4/images/webwork_square.svg
 htdocs/themes/*/*.css
@@ -30,5 +31,16 @@ htdocs/themes/*
 !htdocs/themes/math4-red
 !htdocs/themes/math4-green
 !htdocs/themes/math4-yellow
+!htdocs/themes/layouts
+
 DATA/*
-*.swp
+!DATA/uploads
+DATA/uploads/*
+!*README*
+
+docker-compose.yml
+docker-config/ssl/*
+!docker-config/ssl/Readme
+
+.vscode
+.vim

.perltidyrc

@@ -20,3 +20,4 @@
 -nlop   # No logical padding (this causes mixed tabs and spaces)
 -wn     # Weld nested containers
 -xci    # Extended continuation indentation
+-vxl='q' # No vertical alignment of qw quotes