Skip to content

Commit

Permalink
Merge pull request #142 from iMattPro/updates
Browse files Browse the repository at this point in the history 
Minor Updates
  • Loading branch information
@iMattPro
iMattPro authored Dec 29, 2023
2 parents 2d0e069 + 26d07db commit 1348cb9
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 40 deletions.
44 changes: 22 additions & 22 deletions .github/workflows/tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ name: Tests

env:
EXTNAME: phpbb/skeleton # Your extension vendor/package name
SNIFF: 1 # Run code sniffer on your code? 1 or 0
IMAGE_ICC: 1 # Run icc profile sniffer on your images? 1 or 0
EPV: 1 # Run EPV (Extension Pre Validator) on your code? 1 or 0
EXECUTABLE_FILES: 1 # Run check for executable files? 1 or 0
PHPBB_BRANCH: 3.3.x # The phpBB branch to run tests on
SNIFF: 1 # Run code sniffer on your code? 1 or 0
IMAGE_ICC: 1 # Run icc profile sniffer on your images? 1 or 0
EPV: 1 # Run EPV (Extension Pre Validator) on your code? 1 or 0
EXECUTABLE_FILES: 1 # Run check for executable files? 1 or 0
PHPBB_BRANCH: 3.3.x # The phpBB branch to run tests on

on:
push:
Expand Down Expand Up @@ -93,24 +93,22 @@ jobs:
strategy:
matrix:
include:
- php: '7.1'
- php: '7.2'
db: "mariadb:10.1"
- php: '7.1'
- php: '7.2'
db: "mariadb:10.2"
- php: '7.1'
- php: '7.2'
db: "mariadb:10.3"
- php: '7.1'
- php: '7.2'
db: "mariadb:10.4"
- php: '7.1'
- php: '7.2'
db: "mariadb:10.5"
- php: '7.1'
- php: '7.2'
db: "mysql:5.6"
db_alias: "MyISAM Tests"
MYISAM: 1
- php: '7.1'
- php: '7.2'
db: "mysql:5.6"
- php: '7.1'
db: "mysql:5.7"
- php: '7.2'
db: "mysql:5.7"
COVERAGE: 1
Expand All @@ -127,6 +125,8 @@ jobs:
db: "mysql:5.7"
- php: '8.2'
db: "mysql:5.7"
- php: '8.3'
db: "mysql:5.7"

name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}

Expand Down Expand Up @@ -244,18 +244,16 @@ jobs:
strategy:
matrix:
include:
- php: '7.1'
- php: '7.2'
db: "postgres:9.5"
- php: '7.1'
- php: '7.2'
db: "postgres:9.6"
- php: '7.1'
- php: '7.2'
db: "postgres:10"
- php: '7.1'
- php: '7.2'
db: "postgres:11"
- php: '7.1'
- php: '7.2'
db: "postgres:12"
- php: '7.1'
db: "postgres:13"
- php: '7.2'
db: "postgres:13"
- php: '7.3'
Expand All @@ -270,6 +268,8 @@ jobs:
db: "postgres:14"
- php: '8.2'
db: "postgres:14"
- php: '8.3'
db: "postgres:14"

name: PHP ${{ matrix.php }} - ${{ matrix.db }}

Expand Down Expand Up @@ -358,7 +358,7 @@ jobs:
strategy:
matrix:
include:
- php: '7.1'
- php: '7.2'
db: "sqlite3"
- php: '7.2'
db: "mcr.microsoft.com/mssql/server:2017-latest"
Expand Down
10 changes: 9 additions & 1 deletion controller/main.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,15 @@ public function handle()
$this->data['components'][$component] = $this->get_user_input('component_' . $component, $details['default']);
}

$this->template->assign_var('S_POST_ACTION', $this->helper->route('phpbb_skeleton_controller'));
$phpbb_skeleton_controller = $this->helper->route('phpbb_skeleton_controller');

$this->template->assign_var('S_POST_ACTION', $phpbb_skeleton_controller);

// Create breadcrumbs
$this->template->assign_block_vars('navlinks', [
'FORUM_NAME' => $this->language->lang('PHPBB_SKELETON_EXT'),
'U_VIEW_FORUM' => $phpbb_skeleton_controller,
]);

return $this->helper->render('@phpbb_skeleton/skeleton_body.html', $this->language->lang('PHPBB_CREATE_SKELETON_EXT'));
}
Expand Down
36 changes: 19 additions & 17 deletions skeleton/.github/workflows/tests.yml.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ env:
on:
push:
branches: # Run tests when commits are pushed to these branches in your repo
- main
- master
- develop
pull_request: # Run tests when pull requests are made on these branches in your repo
branches:
- main
- master
- develop

Expand Down Expand Up @@ -93,24 +95,22 @@ jobs:
strategy:
matrix:
include:
- php: '7.1'
- php: '7.2'
db: "mariadb:10.1"
- php: '7.1'
- php: '7.2'
db: "mariadb:10.2"
- php: '7.1'
- php: '7.2'
db: "mariadb:10.3"
- php: '7.1'
- php: '7.2'
db: "mariadb:10.4"
- php: '7.1'
- php: '7.2'
db: "mariadb:10.5"
- php: '7.1'
- php: '7.2'
db: "mysql:5.6"
db_alias: "MyISAM Tests"
MYISAM: 1
- php: '7.1'
- php: '7.2'
db: "mysql:5.6"
- php: '7.1'
db: "mysql:5.7"
- php: '7.2'
db: "mysql:5.7"
- php: '7.3'
Expand All @@ -125,6 +125,8 @@ jobs:
db: "mysql:5.7"
- php: '8.2'
db: "mysql:5.7"
- php: '8.3'
db: "mysql:5.7"

name: PHP ${{ '{{' }} matrix.php }} - ${{ '{{' }} matrix.db_alias != '' && matrix.db_alias || matrix.db }}

Expand Down Expand Up @@ -211,18 +213,16 @@ jobs:
strategy:
matrix:
include:
- php: '7.1'
- php: '7.2'
db: "postgres:9.5"
- php: '7.1'
- php: '7.2'
db: "postgres:9.6"
- php: '7.1'
- php: '7.2'
db: "postgres:10"
- php: '7.1'
- php: '7.2'
db: "postgres:11"
- php: '7.1'
- php: '7.2'
db: "postgres:12"
- php: '7.1'
db: "postgres:13"
- php: '7.2'
db: "postgres:13"
- php: '7.3'
Expand All @@ -237,6 +237,8 @@ jobs:
db: "postgres:14"
- php: '8.2'
db: "postgres:14"
- php: '8.3'
db: "postgres:14"

name: PHP ${{ '{{' }} matrix.php }} - ${{ '{{' }} matrix.db }}

Expand Down Expand Up @@ -325,7 +327,7 @@ jobs:
strategy:
matrix:
include:
- php: '7.1'
- php: '7.2'
db: "sqlite3"
- php: '7.2'
db: "mcr.microsoft.com/mssql/server:2017-latest"
Expand Down

0 comments on commit 1348cb9

Please sign in to comment.