From 908529aaea10eaecab6093d919f5b3da326cf64a Mon Sep 17 00:00:00 2001 From: amagan Date: Mon, 13 Jul 2026 12:10:02 +0200 Subject: [PATCH 1/3] ci: align workflows with git flow Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/workflows/code-npm_node-sonarcloud-analysis.yml | 6 +++++- .github/workflows/pr-verify.yml | 6 +++--- .github/workflows/push-verify.yml | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/code-npm_node-sonarcloud-analysis.yml b/.github/workflows/code-npm_node-sonarcloud-analysis.yml index e0a635f..6185d3d 100644 --- a/.github/workflows/code-npm_node-sonarcloud-analysis.yml +++ b/.github/workflows/code-npm_node-sonarcloud-analysis.yml @@ -34,7 +34,11 @@ jobs: permissions: contents: read timeout-minutes: 30 - if: ${{ (github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' || github.event_name == 'release') && vars.IS_INDITEXTECH_REPO == 'true' }} + if: >- + ${{ + (github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' || github.event_name == 'release') + && vars.SONARCLOUD_ENABLED == 'true' + }} runs-on: ubuntu-24.04 steps: - name: Checkout diff --git a/.github/workflows/pr-verify.yml b/.github/workflows/pr-verify.yml index ed382f3..5baf78b 100644 --- a/.github/workflows/pr-verify.yml +++ b/.github/workflows/pr-verify.yml @@ -18,7 +18,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: fetch-depth: 0 - ref: ${{ github.event.pull_request.head.sha }} + ref: ${{ github.event.pull_request.head.sha || github.sha }} - name: 'Run Repolinter' uses: newrelic/repolinter-action@3f4448f855c351e9695b24524a4111c7847b84cb # v1.7.0 @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: fetch-depth: 0 - ref: ${{ github.event.pull_request.head.sha }} + ref: ${{ github.event.pull_request.head.sha || github.sha }} - name: REUSE Compliance Check uses: fsfe/reuse-action@bb774aa972c2a89ff34781233d275075cbddf542 # v5 @@ -44,6 +44,6 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: fetch-depth: 0 - ref: ${{ github.event.pull_request.head.sha }} + ref: ${{ github.event.pull_request.head.sha || github.sha }} - uses: webiny/action-conventional-commits@8bc41ff4e7d423d56fa4905f6ff79209a78776c7 # v1.3.0 diff --git a/.github/workflows/push-verify.yml b/.github/workflows/push-verify.yml index 25f2c68..f44f1cf 100644 --- a/.github/workflows/push-verify.yml +++ b/.github/workflows/push-verify.yml @@ -5,8 +5,8 @@ name: Push Verification permissions: read-all on: push: - # Only the default branch is supported. - branches: [ 'main' ] + # Run on the long-lived git-flow branches. + branches: ["develop", "main"] jobs: From c41fad0a6a7b6b0f95cf2736767320e224730d9c Mon Sep 17 00:00:00 2001 From: amagan Date: Mon, 13 Jul 2026 12:10:04 +0200 Subject: [PATCH 2/3] docs: document git flow contribution model Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/PULL_REQUEST_TEMPLATE.md | 2 ++ CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.md | 12 ++++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 2704e61..63e78c4 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -13,6 +13,8 @@ Briefly describe the purpose of this PR and what changes it introduces. - [ ] Commits are **signed** (`git commit -S`) - [ ] Commit messages follow **Conventional Commits** - [ ] Documentation has been updated (if needed) +- [ ] The target branch follows the git flow model (`develop` for feature/fix PRs, `main` for release/hotfix PRs) +- [ ] PRs targeting `main` have a `release-type/...` label or are intentionally marked `skip-release` - [ ] I have read and agree to the project’s [Code of Conduct](../CODE_OF_CONDUCT.md) - [ ] I have signed the [Contributor License Agreement (CLA)](../CONTRIBUTING.md) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 534e383..553f48d 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -8,6 +8,6 @@ SPDX-License-Identifier: Apache-2.0 By participating in this project, you agree to abide by the rules and principles outlined in the Code of Conduct. Please review it to understand the expectations for respectful and inclusive collaboration. -This project adheres to the general [Inditex Tech Code of Conduct](https://github.com/sudo InditexTech/foss/blob/main/CODE_OF_CONDUCT.md). +This project adheres to the general [Inditex Tech Code of Conduct](https://github.com/InditexTech/foss/blob/main/CODE_OF_CONDUCT.md). For any inquiries regarding this Code of Conduct, please contact us at oso@inditex.com. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fa5a94e..f706ed3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,19 +19,23 @@ To maintain a collaborative and respectful environment, please consider the foll 1. Open an issue to discuss and gather feedback on the feature or fix you wish to address. 2. Fork the repository and clone it to your local machine. -3. Create a new branch to work on your contribution: `git checkout -b your-branch-name`. +3. Create a new branch from the latest `develop` branch to work on your contribution: + `git checkout -b feature/your-branch-name`. 4. Make the necessary changes in your local branch. 5. Ensure that your code follows the established project style and formatting guidelines. 6. Perform testing to ensure your changes do not introduce errors. 7. Make clear and descriptive commits that explain your changes. 8. Push your branch to the remote repository: `git push origin your-branch-name`. -9. Open a pull request describing your changes and linking the corresponding issue. +9. Open a pull request against `develop` describing your changes and linking the corresponding issue. 10. Await comments and discussions on your pull request. Make any necessary modifications based on the received feedback. -11. Once your pull request is approved, your contribution will be merged into the main branch. +11. Once your pull request is approved, your contribution will be merged into `develop`. + +Project maintainers prepare releases by opening `release/*` or `hotfix/*` pull requests against `main`. Release pull +requests must include a `release-type/...` label unless the release is intentionally skipped. ## Contribution Guidelines -- All contributors are expected to follow the project's [code of conduct](CODE_of_CONDUCT.md). Please be respectful and +- All contributors are expected to follow the project's [code of conduct](CODE_OF_CONDUCT.md). Please be respectful and considerate towards other contributors. - Before starting work on a new feature or fix, check existing [issues](../../issues) and [pull requests](../../pulls) to avoid duplications and unnecessary discussions. From 6ead0e62dec21ffa4aec7b9c8dd63c00f61c7c68 Mon Sep 17 00:00:00 2001 From: amagan Date: Mon, 13 Jul 2026 12:14:10 +0200 Subject: [PATCH 3/3] ci: restore InditexTech SonarCloud guard Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/workflows/code-npm_node-sonarcloud-analysis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/code-npm_node-sonarcloud-analysis.yml b/.github/workflows/code-npm_node-sonarcloud-analysis.yml index 6185d3d..574bf37 100644 --- a/.github/workflows/code-npm_node-sonarcloud-analysis.yml +++ b/.github/workflows/code-npm_node-sonarcloud-analysis.yml @@ -37,6 +37,7 @@ jobs: if: >- ${{ (github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' || github.event_name == 'release') + && vars.IS_INDITEXTECH_REPO == 'true' && vars.SONARCLOUD_ENABLED == 'true' }} runs-on: ubuntu-24.04