Skip to content

Add FPM option in all workflows #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jolelievre wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add FPM option in all workflows #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/actions/run-tests/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ inputs:
DB_SERVER:
description: Database Type
required: true
PHP_FPM:
required: false
description: Use PHP FPM instead of apache (default false)
default: 'false'

runs:
using: "composite"
Expand All @@ -50,7 +54,7 @@ runs:
PS_DEV_MODE: ${{ fromJson(inputs.ps_mode_dev) && '1' || '0' }}
PHP_VERSION: ${{ inputs.php_version }}
NODE_VERSION: ${{ inputs.node_version }}
VERSION: ${{ inputs.php_version }}-apache
VERSION: ${{ inputs.php_version }}-${{ (inputs.PHP_FPM == 'true') && 'fpm' || 'apache' }}
PS_DOMAIN: ${{ ((inputs.base_branch == '8.0.x') || (inputs.base_branch == '1.7.8.x')) && 'localhost:8001' || 'localhost:8002' }}
PS_ENABLE_SSL: ${{ ((inputs.base_branch == '8.0.x') || (inputs.base_branch == '1.7.8.x')) && '0' || '1' }}
PS_USE_DOCKER_MAILDEV: 0
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/build-shop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ on:
type: string
description: Database Type
required: true
PHP_FPM:
type: boolean
required: true
description: Use PHP FPM instead of apache (default false)
default: false

jobs:
build-shop-artifacts:
Expand All @@ -41,7 +46,7 @@ jobs:
PS_DEV_MODE: ${{ inputs.ps_mode_dev && '1' || '0' }}
PHP_VERSION: ${{ inputs.php_version }}
NODE_VERSION: ${{ inputs.node_version }}
VERSION: ${{ inputs.php_version }}-apache
VERSION: ${{ inputs.php_version }}-${{ inputs.PHP_FPM && 'fpm' || 'apache' }}
PS_DOMAIN: ${{ ((inputs.base_branch == '8.0.x') || (inputs.base_branch == '1.7.8.x')) && 'localhost:8001' || 'localhost:8002' }}
PS_ENABLE_SSL: ${{ ((inputs.base_branch == '8.0.x') || (inputs.base_branch == '1.7.8.x')) && '0' || '1' }}
PS_USE_DOCKER_MAILDEV: 0
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/pr_security_test_one.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ on:
- 'mysql'
- 'mariadb'
default: 'mysql'
PHP_FPM:
type: boolean
required: true
description: Use PHP FPM instead of apache (default false)
default: false

jobs:
testing-pr:
Expand Down Expand Up @@ -293,6 +298,7 @@ jobs:
CP_API_CONFIG: ${{ env.CP_API_CONFIG }}
DEV_MODE: ${{ inputs.DEV_MODE }}
DB_SERVER: ${{ inputs.DB_SERVER }}
PHP_FPM: ${{ inputs.PHP_FPM && 'true' || 'false' }}
env:
ENABLE_SSL: ${{ ((inputs.BASE_BRANCH == '1.7.8.x') || (inputs.BASE_BRANCH == '8.0.x')) && 'false' || 'true' }}
INSTALL_AUTO: ${{ (matrix.TEST_CAMPAIGN == 'sanity') && 'false' || 'true' }}
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/pr_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ on:
- 'mysql'
- 'mariadb'
default: 'mysql'
PHP_FPM:
type: boolean
required: true
description: Use PHP FPM instead of apache (default false)
default: false

jobs:
# Sanity tests are run independently because it's the only campaign that handles the installation itself, since it tests it
Expand All @@ -85,6 +90,7 @@ jobs:
fast_fail: ${{ inputs.fast_fail }}
take_screenshot_after_each_step: ${{ inputs.take_screenshot_after_each_step }}
DB_SERVER: ${{ inputs.DB_SERVER }}
PHP_FPM: ${{ inputs.PHP_FPM }}

# We perform a unique build that is stored as an artifact, only then do we start the campaign that will rely on this build
build-shop:
Expand All @@ -98,6 +104,7 @@ jobs:
php_version: ${{ inputs.php_version }}
node_version: ${{ inputs.node_version }}
DB_SERVER: ${{ inputs.DB_SERVER }}
PHP_FPM: ${{ inputs.PHP_FPM }}

# These campaigns are run first because they are longer, so we try to optimize the total run However this list must not
# be too long or too many runners will be blocked by these campaigns and the split would be counter-productive, it's a
Expand All @@ -115,6 +122,7 @@ jobs:
fast_fail: ${{ inputs.fast_fail }}
take_screenshot_after_each_step: ${{ inputs.take_screenshot_after_each_step }}
DB_SERVER: ${{ inputs.DB_SERVER }}
PHP_FPM: ${{ inputs.PHP_FPM }}
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -185,6 +193,7 @@ jobs:
fast_fail: ${{ inputs.fast_fail }}
take_screenshot_after_each_step: ${{ inputs.take_screenshot_after_each_step }}
DB_SERVER: ${{ inputs.DB_SERVER }}
PHP_FPM: ${{ inputs.PHP_FPM }}
strategy:
fail-fast: false
matrix:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/pr_test_one.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ on:
description: Fast fail on first error
required: true
default: true
PHP_FPM:
type: boolean
required: true
description: Use PHP FPM instead of apache (default false)
default: false

jobs:
testing-pr:
Expand Down Expand Up @@ -323,6 +328,7 @@ jobs:
CP_API_CONFIG: ${{ env.CP_API_CONFIG }}
DEV_MODE: ${{ inputs.DEV_MODE }}
DB_SERVER: ${{ inputs.DB_SERVER }}
PHP_FPM: ${{ inputs.PHP_FPM && 'true' || 'false' }}
env:
ENABLE_SSL: ${{ ((inputs.BASE_BRANCH == '1.7.8.x') || (inputs.BASE_BRANCH == '8.0.x')) && 'false' || 'true' }}
INSTALL_AUTO: ${{ (matrix.TEST_CAMPAIGN == 'sanity') && 'false' || 'true' }}
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/pr_test_single_campaign.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@ on:
- 'mysql'
- 'mariadb'
default: 'mysql'
PHP_FPM:
type: boolean
required: true
description: Use PHP FPM instead of apache (default false)
default: false

jobs:
build-shop:
Expand All @@ -138,6 +143,7 @@ jobs:
php_version: ${{ inputs.php_version }}
node_version: ${{ inputs.node_version }}
DB_SERVER: ${{ inputs.DB_SERVER }}
PHP_FPM: ${{ inputs.PHP_FPM }}

test-pr:
name: Run single campaign ${{ inputs.test_command }}
Expand All @@ -153,6 +159,7 @@ jobs:
fast_fail: ${{ inputs.fast_fail }}
take_screenshot_after_each_step: ${{ inputs.take_screenshot_after_each_step }}
DB_SERVER: ${{ inputs.DB_SERVER }}
PHP_FPM: ${{ inputs.PHP_FPM }}

# Sanity campaign is run differently
sanity-test:
Expand All @@ -169,3 +176,4 @@ jobs:
fast_fail: ${{ inputs.fast_fail }}
take_screenshot_after_each_step: ${{ inputs.take_screenshot_after_each_step }}
DB_SERVER: ${{ inputs.DB_SERVER }}
PHP_FPM: ${{ inputs.PHP_FPM }}
8 changes: 7 additions & 1 deletion .github/workflows/test-sanity.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ on:
type: string
description: Database Type
required: true
PHP_FPM:
type: string
required: false
description: Use PHP FPM instead of apache (default false)
default: 'false'

jobs:
test-sanity:
Expand All @@ -51,7 +56,7 @@ jobs:
PS_DEV_MODE: ${{ inputs.ps_mode_dev && '1' || '0' }}
PHP_VERSION: ${{ inputs.php_version }}
NODE_VERSION: ${{ inputs.node_version }}
VERSION: ${{ inputs.php_version }}-apache
VERSION: ${{ inputs.php_version }}-${{ inputs.PHP_FPM && 'fpm' || 'apache' }}
PS_DOMAIN: ${{ ((inputs.base_branch == '8.0.x') || (inputs.base_branch == '1.7.8.x')) && 'localhost:8001' || 'localhost:8002' }}
PS_ENABLE_SSL: ${{ ((inputs.base_branch == '8.0.x') || (inputs.base_branch == '1.7.8.x')) && '0' || '1' }}
PS_USE_DOCKER_MAILDEV: 0
Expand Down Expand Up @@ -216,3 +221,4 @@ jobs:
take_screenshot_after_each_step: ${{ inputs.take_screenshot_after_each_step }}
ps_dir: ${{ env.PS_DIR }}
DB_SERVER: ${{ inputs.DB_SERVER }}
PHP_FPM: ${{ inputs.PHP_FPM && 'true' || 'false' }}
8 changes: 7 additions & 1 deletion .github/workflows/test-with-prebuilt-shop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ on:
type: string
description: Database Type
required: true
PHP_FPM:
type: string
required: false
description: Use PHP FPM instead of apache (default false)
default: 'false'

jobs:
install-from-artifact:
Expand All @@ -47,7 +52,7 @@ jobs:
PS_DEV_MODE: ${{ inputs.ps_mode_dev && '1' || '0' }}
PHP_VERSION: ${{ inputs.php_version }}
NODE_VERSION: ${{ inputs.node_version }}
VERSION: ${{ inputs.php_version }}-apache
VERSION: ${{ inputs.php_version }}-${{ inputs.PHP_FPM && 'fpm' || 'apache' }}
PS_DOMAIN: ${{ ((inputs.base_branch == '8.0.x') || (inputs.base_branch == '1.7.8.x')) && 'localhost:8001' || 'localhost:8002' }}
PS_ENABLE_SSL: ${{ ((inputs.base_branch == '8.0.x') || (inputs.base_branch == '1.7.8.x')) && '0' || '1' }}
PS_USE_DOCKER_MAILDEV: 0
Expand Down Expand Up @@ -186,3 +191,4 @@ jobs:
take_screenshot_after_each_step: ${{ inputs.take_screenshot_after_each_step }}
ps_dir: ${{ env.PS_DIR }}
DB_SERVER: ${{ inputs.DB_SERVER }}
PHP_FPM: ${{ inputs.PHP_FPM && 'true' || 'false' }}