-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #120 from alma/chore/merge-develop-into-main
Merge release workflow and unit tests improvement into main
- Loading branch information
Showing
65 changed files
with
2,527 additions
and
4,486 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
# Grant ownership of all files by default to the ECOM integrations squad | ||
* @alma/squad-e-commerce-integrations | ||
|
||
# Grant DevX ownership of Github workflows and actions | ||
.github @alma/squad-devx | ||
|
||
# Grant DevX ownership of Taskfile | ||
Taskfile.yml @alma/squad-devx |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
'type: chore': ['chore/*', 'renovate/*', 'chore(deps):*'] | ||
'type: ci': ci/* | ||
'type: perf': perf/* | ||
'type: refator': refactor/* | ||
'type: test': test/* | ||
'type: docs': docs/* | ||
'type: bugfix': ['fix/*', 'bug/*', 'hotfix-backport/*'] | ||
'type: feature': ['feature/*', 'feat/*'] | ||
'type: security': ['security/*', 'dependabot/*'] | ||
'type: hotfix': 'hotfix/*' | ||
'type: devx': 'devx/*' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
# This workflow is triggered when a pull request is merged and the label 'release' is present. | ||
# It opens a pull request to backport the changes from main to develop. | ||
name: Create backport pull request | ||
|
||
on: | ||
pull_request: | ||
branches: | ||
- main | ||
types: | ||
- closed | ||
|
||
jobs: | ||
|
||
create-backport-pull-request: | ||
if: ${{ (github.event.pull_request.merged == true) && (contains(github.event.pull_request.labels.*.name, 'release')) }} | ||
runs-on: ubuntu-22.04 | ||
|
||
steps: | ||
|
||
- uses: actions/checkout@v4 | ||
with: | ||
ref: develop | ||
|
||
# See https://github.com/peter-evans/create-pull-request/blob/main/docs/examples.md#keep-a-branch-up-to-date-with-another | ||
- name: Fetch main branch | ||
run: | | ||
git fetch origin main:main | ||
git reset --hard main | ||
- name: Create Pull Request | ||
uses: peter-evans/create-pull-request@v6 | ||
with: | ||
commit-message: 'chore: backport main to develop' | ||
title: Backport main to develop | ||
branch: chore/backport-main-to-develop | ||
base: develop | ||
labels: skip-changelog |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
name: Continuous integration | ||
|
||
on: | ||
workflow_dispatch: ~ | ||
push: | ||
branches: | ||
- develop | ||
- main | ||
pull_request: | ||
branches: | ||
- develop | ||
- main | ||
|
||
jobs: | ||
ci: | ||
name: Linting, tests and coverage | ||
runs-on: ubuntu-22.04 | ||
|
||
strategy: | ||
fail-fast: false | ||
matrix: | ||
php: | ||
- "5.6" | ||
- "7.0" | ||
- "7.1" | ||
- "7.2" | ||
- "7.3" | ||
- "7.4" | ||
- "8.0" | ||
- "8.1" | ||
- "8.2" | ||
- "8.3" | ||
|
||
steps: | ||
- name: Checkout repository | ||
uses: actions/checkout@v4 | ||
with: | ||
persist-credentials: false | ||
|
||
- name: Setup PHP | ||
uses: shivammathur/setup-php@v2 | ||
with: | ||
php-version: ${{ matrix.php }} | ||
tools: composer:v2 | ||
|
||
- name: Validate composer.json and composer.lock | ||
run: composer validate | ||
|
||
- name: Install dependencies | ||
run: composer install --prefer-dist --no-progress | ||
|
||
- name: Ensure source code is linted | ||
run: composer exec phpcs -- src/ | ||
|
||
- name: Remove uncompliant statements in legacy code | ||
if: contains(fromJson('["5.6", "7.0"]'), matrix.php) | ||
run: | | ||
# Replace string in files | ||
string=': void' | ||
grep -r -l "$string" tests/ | xargs sed -i "s/$string//g" | ||
- name: PHPUnit | ||
run: composer exec phpunit -- --configuration phpunit.ci.xml --coverage-xml ./.coverage | ||
env: | ||
XDEBUG_MODE: coverage | ||
|
||
- name: PHPUnit threshold | ||
run: php ./phpunit-threshold.php |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
name: Create hotfix pull request | ||
|
||
on: | ||
workflow_dispatch: | ||
inputs: | ||
changelog-message: | ||
type: string | ||
description: The message to add to the changelog | ||
required: true | ||
|
||
jobs: | ||
|
||
create-hotfix-pull-request: | ||
runs-on: ubuntu-22.04 | ||
|
||
steps: | ||
|
||
- uses: actions/checkout@v4 | ||
with: | ||
ref: main | ||
|
||
- name: Release drafter | ||
uses: release-drafter/release-drafter@v6 | ||
id: release-drafter | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
- name: Update release draft | ||
uses: actions/github-script@v7 | ||
with: | ||
script: | | ||
const { owner, repo } = context.repo; | ||
await github.rest.repos.updateRelease({ | ||
owner, | ||
repo, | ||
release_id: "${{ steps.release-drafter.outputs.id }}", | ||
draft: true, | ||
body: "### 🐛 Bug Fixes\n ${{ inputs.changelog-message }}\n" | ||
}); | ||
- name: Update CHANGELOG.md file | ||
uses: stefanzweifel/changelog-updater-action@v1 | ||
with: | ||
latest-version: ${{ steps.release-drafter.outputs.tag_name }} | ||
release-notes: "### 🐛 Bug Fixes\n ${{ inputs.changelog-message }}\n" | ||
|
||
- name: Update other files | ||
run: | | ||
./scripts/update-files-with-release-version.sh ${{ steps.release-drafter.outputs.tag_name }} | ||
- name: Create Pull Request | ||
uses: peter-evans/create-pull-request@v6 | ||
with: | ||
commit-message: 'chore: update version' | ||
title: Release ${{ steps.release-drafter.outputs.tag_name }} | ||
body: | | ||
Update version to ${{ steps.release-drafter.outputs.tag_name }} | ||
### Checklist of actions to be done before merging | ||
- [ ] Review and update the CHANGELOG.md if needed | ||
- [ ] Review and update the Github release draft if needed | ||
- [ ] Review the files updated with the new version number in the commit named "chore: update version" | ||
branch: hotfix/${{ steps.release-drafter.outputs.tag_name }} | ||
base: main | ||
labels: hotfix, release | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
name: PR Labeler | ||
on: | ||
pull_request: | ||
types: [opened] | ||
|
||
jobs: | ||
pr-labeler: | ||
permissions: | ||
contents: read | ||
pull-requests: write | ||
|
||
runs-on: ubuntu-22.04 | ||
steps: | ||
- uses: TimonVS/pr-labeler-action@v5 | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} |
Oops, something went wrong.