Skip to content

Commit 88420fc

Browse files
authored
Merge pull request #1074 from openwebwork/PG-2.19
PG 2.19 Release Candidate
2 parents 2bd3ca3 + f7c8b67 commit 88420fc

File tree

267 files changed

+18522
-11325
lines changed

Some content is hidden

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

267 files changed

+18522
-11325
lines changed

.editorconfig

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
insert_final_newline = true
7+
max_line_length = 120
8+
trim_trailing_whitespace = true
9+
indent_style = tab
10+
indent_size = 4
11+
12+
[*.yml]
13+
indent_style = space
14+
indent_size = 2
15+
16+
[*.pg]
17+
trim_trailing_whitespace = false
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
---
2+
name: Check Formatting of 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: Check Perl file formatting with perltidy
16+
runs-on: ubuntu-22.04
17+
container:
18+
image: perl:5.34
19+
steps:
20+
- name: Checkout code
21+
uses: actions/checkout@v4
22+
- name: Install dependencies
23+
run: cpanm -n Perl::Tidy@20220613
24+
- name: Run perltidy
25+
shell: bash
26+
run: |
27+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
28+
shopt -s extglob globstar nullglob
29+
perltidy --pro=./.perltidyrc -b -bext='/' ./**/*.p[lm] ./**/*.t && git diff --exit-code
30+
31+
prettier:
32+
name: Check JavaScript, style, and HTML file formatting with prettier
33+
runs-on: ubuntu-22.04
34+
steps:
35+
- name: Checkout code
36+
uses: actions/checkout@v4
37+
- name: Install Node
38+
uses: actions/setup-node@v4
39+
with:
40+
node-version: '20'
41+
- name: Install Dependencies
42+
run: cd htdocs && npm ci --ignore-scripts
43+
- name: Check formatting with prettier
44+
run: cd htdocs && npm run prettier-check

.github/workflows/linter.yml

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

.github/workflows/unit-tests.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-22.04
1111
steps:
1212
- name: Checkout PG code
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414

1515
- name: Install Ubuntu dependencies
1616
run: |
@@ -28,6 +28,8 @@ jobs:
2828
libhtml-parser-perl \
2929
libjson-perl \
3030
libjson-xs-perl \
31+
liblocale-maketext-lexicon-perl \
32+
libmojolicious-perl \
3133
libtest2-suite-perl \
3234
libtie-ixhash-perl \
3335
libuuid-tiny-perl \

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
conf/pg_config.yml
1+
*~
2+
*.swp
23
*.bak
4+
5+
conf/pg_config.yml
36
cover_db/
47

58
htdocs/node_modules

.prettierrc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"arrowParens": "always",
3+
"bracketSpacing": true,
4+
"printWidth": 120,
5+
"semi": true,
6+
"singleQuote": true,
7+
"trailingComma": "none"
8+
}

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Online Homework Delivery System
33
Version 2.*
44

5-
Copyright 2000-2023, The WeBWorK Project
5+
Copyright 2000-2024, The WeBWorK Project
66
All rights reserved.
77

88
This program is free software; you can redistribute it and/or modify

README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66

77
http://webwork.maa.org/wiki/Category:Release_Notes
88

9-
Copyright 2000-2023, The WeBWorK Project
9+
Copyright 2000-2024, The WeBWorK Project
1010
http://webwork.maa.org
1111
All rights reserved.

VERSION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$PG_VERSION ='2.18';
2-
$PG_COPYRIGHT_YEARS = '1996-2023';
1+
$PG_VERSION ='2.19';
2+
$PG_COPYRIGHT_YEARS = '1996-2024';
33

44
1;

assets/tex/pg.sty

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,7 @@
3636
% semantic macro definitions used by PG
3737
\newcommand{\answerRule}[2][]{\raisebox{-3pt}{\parbox[t]{#2ex}{\hrulefill}}}
3838

39+
% height of a strut, used for example to possition the top border of an inline image
40+
% unit is initialized here, but value is set locally where needed
41+
\newlength{\strutheight}
42+

0 commit comments

Comments
 (0)