Skip to content

Commit a239b77

Browse files
jdarwood007jdarwood007
authored
Master (#171)
* Release 2.1.0 (#158) * Release 2.1.0 * Fix buildTools * Temp patch for SMF 2.1.3 (in dev) bugs (#160) * Temp patch for SMF 2.1.3 (in dev) bugs * fix buildTools * Remove the buildTools Sub Module (#169) * Restore Build Tools (#170) * Restore Build Tools * Bad action * No sub modules * Change the year
1 parent 3e7b445 commit a239b77

File tree

59 files changed

+124
-69
lines changed

Some content is hidden

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

59 files changed

+124
-69
lines changed

‎.github/configs/eslintrc.js‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
module.exports = {
2+
'env': {
3+
'browser': true,
4+
'es2021': true,
5+
'jquery': true
6+
},
7+
'extends': 'eslint:recommended',
8+
'parserOptions': {
9+
'ecmaVersion': 12,
10+
'sourceType': 'module'
11+
},
12+
'rules': {
13+
'indent': [
14+
'error',
15+
'tab',
16+
{"SwitchCase": 1}
17+
],
18+
'linebreak-style': [
19+
'error',
20+
'unix'
21+
],
22+
'quotes': [
23+
'error',
24+
'single'
25+
],
26+
'no-unused-vars': [
27+
'error',
28+
{
29+
'vars': 'local',
30+
'args' : 'none'
31+
}
32+
]
33+
}
34+
};

‎.github/scripts/build_release_package.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* An advanced help desk modification built on SMF *
66
***************************************************************
77
* *
8-
* * Copyright 2022 - SimpleDesk.net *
8+
* * Copyright 2023 - SimpleDesk.net *
99
* *
1010
* This file and its contents are subject to the license *
1111
* included with this distribution, license.txt, which *

‎.github/scripts/check-eof-master.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
* An advanced help desk modification built on SMF *
66
***************************************************************
77
* *
8-
* * Copyright 2022 - SimpleDesk.net *
8+
* * Copyright 2023 - SimpleDesk.net *
99
* *
1010
* This file and its contents are subject to the license *
1111
* included with this distribution, license.txt, which *
1212
* states that this software is New BSD Licensed. *
1313
* Any questions, please contact SimpleDesk.net *
1414
* *
1515
***************************************************************
16-
* SimpleDesk Version: 2.1 Beta 1 *
16+
* SimpleDesk Version: 2.1.0 *
1717
* File Info: check-eof-master.php *
1818
**************************************************************/
1919

‎.github/scripts/check-eof.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55
* An advanced help desk modification built on SMF *
66
***************************************************************
77
* *
8-
* * Copyright 2022 - SimpleDesk.net *
8+
* * Copyright 2023 - SimpleDesk.net *
99
* *
1010
* This file and its contents are subject to the license *
1111
* included with this distribution, license.txt, which *
1212
* states that this software is New BSD Licensed. *
1313
* Any questions, please contact SimpleDesk.net *
1414
* *
1515
***************************************************************
16-
* SimpleDesk Version: 2.1 Beta 1 *
16+
* SimpleDesk Version: 2.1.0 *
1717
* File Info: check-eof.php *
1818
**************************************************************/
1919

2020
// Stuff we will ignore.
2121
$ignoreFiles = array(
2222
'\.github/',
23-
'\.buildTools/',
23+
'\.github/scripts/',
2424
);
2525

2626
// No file? Thats bad.

‎.github/scripts/check-license-master.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
* An advanced help desk modification built on SMF *
66
***************************************************************
77
* *
8-
* * Copyright 2022 - SimpleDesk.net *
8+
* * Copyright 2023 - SimpleDesk.net *
99
* *
1010
* This file and its contents are subject to the license *
1111
* included with this distribution, license.txt, which *
1212
* states that this software is New BSD Licensed. *
1313
* Any questions, please contact SimpleDesk.net *
1414
* *
1515
***************************************************************
16-
* SimpleDesk Version: 2.1 Beta 1 *
16+
* SimpleDesk Version: 2.1.0 *
1717
* File Info: check-license-master.php *
1818
**************************************************************/
1919

‎.github/scripts/check-license.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
);
3838

3939
$ignoreFilesVersion = array(
40-
'/buildTools/check-[A-Za-z0-9-_]+\.php',
40+
'/.github/scripts/check-[A-Za-z0-9-_]+\.php',
4141
);
4242

4343
// No file? Thats bad.

‎.github/scripts/check-php-syntax.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
* An advanced help desk modification built on SMF *
66
***************************************************************
77
* *
8-
* * Copyright 2022 - SimpleDesk.net *
8+
* * Copyright 2023 - SimpleDesk.net *
99
* *
1010
* This file and its contents are subject to the license *
1111
* included with this distribution, license.txt, which *
1212
* states that this software is New BSD Licensed. *
1313
* Any questions, please contact SimpleDesk.net *
1414
* *
1515
***************************************************************
16-
* SimpleDesk Version: 2.1 Beta 1 *
16+
* SimpleDesk Version: 2.1.0 *
1717
* File Info: check-php-syntax.php *
1818
**************************************************************/
1919

‎.github/scripts/check-signed-off.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
* An advanced help desk modification built on SMF *
66
***************************************************************
77
* *
8-
* * Copyright 2022 - SimpleDesk.net *
8+
* * Copyright 2023 - SimpleDesk.net *
99
* *
1010
* This file and its contents are subject to the license *
1111
* included with this distribution, license.txt, which *
1212
* states that this software is New BSD Licensed. *
1313
* Any questions, please contact SimpleDesk.net *
1414
* *
1515
***************************************************************
16-
* SimpleDesk Version: 2.1 Beta 1 *
16+
* SimpleDesk Version: 2.1.0 *
1717
* File Info: check-signed-off.php *
1818
**************************************************************/
1919

‎.github/workflows/Javascript-Check.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Javascript Checks
2+
3+
on:
4+
push:
5+
branches: [ smf21, smf20, master ]
6+
pull_request:
7+
branches: [ smf21, smf20, master ]
8+
9+
workflow_dispatch:
10+
jobs:
11+
lint:
12+
runs-on: ubuntu-latest
13+
name: LINT Checks
14+
steps:
15+
- uses: actions/checkout@master
16+
with:
17+
submodules: false
18+
- name: Javascript LINT
19+
uses: tj-actions/eslint-changed-files@v4
20+
with:
21+
config-path: ./.github/configs/eslintrc.js

‎.github/workflows/Software-Check.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,27 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@master
1616
with:
17-
submodules: true
17+
submodules: false
1818
- name: Checking Sign off
1919
id: check-signoff
20-
run: php .github/scripts/check-signed-off.php github
20+
run: php ./.github/scripts/check-signed-off.php github
2121
check-licensing:
2222
runs-on: ubuntu-latest
2323
name: Check Licensing
2424
steps:
2525
- uses: actions/checkout@master
2626
with:
27-
submodules: true
27+
submodules: false
2828
- name: Checking Licensing
2929
id: check-licensing
30-
run: php .github/scripts/check-license-master.php ./
30+
run: php ./.github/scripts/check-license-master.php ./
3131
check-eof:
3232
runs-on: ubuntu-latest
3333
name: Check End of File
3434
steps:
3535
- uses: actions/checkout@master
3636
with:
37-
submodules: true
37+
submodules: false
3838
- name: Checking End of File
3939
id: check-eof
40-
run: php .github/scripts/check-eof-master.php ./
40+
run: php ./.github/scripts/check-eof-master.php ./

0 commit comments

Comments
 (0)