From b601b9ec62024c43ff8db112947503cc9ed70c37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20S=C3=A1nchez?= Date: Tue, 24 Jun 2025 12:23:10 +0200 Subject: [PATCH] Fix `6_builderpackage_plugins_onpush.yml` (#508) * Fix on push workflow and rename the workflows * Fix error with the new name * Add changelog entry and fix documentation --- .../action.yml | 0 ..._builderpackage_docs.yml => 6_builderpackage_docs.yml} | 0 ...erpackage_plugins.yml => 6_builderpackage_plugins.yml} | 0 ...ins_onpush.yml => 6_builderpackage_plugins_onpush.yml} | 6 ++++-- ...ckage_templates.yml => 6_builderpackage_templates.yml} | 0 ...equality_changelog.yml => 6_codequality_changelog.yml} | 0 ...{5_codequality_codeql.yml => 6_codequality_codeql.yml} | 0 .../{5_codequality_links.yml => 6_codequality_links.yml} | 0 ..._gradlecheck.yml => 6_testintegration_gradlecheck.yml} | 2 +- CHANGELOG.md | 1 + README.md | 8 ++++---- docs/dev/build-image.md | 2 +- 12 files changed, 11 insertions(+), 8 deletions(-) rename .github/actions/{5_codeanalysis_detect_modified_plugins => 6_codeanalysis_detect_modified_plugins}/action.yml (100%) rename .github/workflows/{5_builderpackage_docs.yml => 6_builderpackage_docs.yml} (100%) rename .github/workflows/{5_builderpackage_plugins.yml => 6_builderpackage_plugins.yml} (100%) rename .github/workflows/{5_builderpackage_plugins_onpush.yml => 6_builderpackage_plugins_onpush.yml} (88%) rename .github/workflows/{5_builderpackage_templates.yml => 6_builderpackage_templates.yml} (100%) rename .github/workflows/{5_codequality_changelog.yml => 6_codequality_changelog.yml} (100%) rename .github/workflows/{5_codequality_codeql.yml => 6_codequality_codeql.yml} (100%) rename .github/workflows/{5_codequality_links.yml => 6_codequality_links.yml} (100%) rename .github/workflows/{5_testintegration_gradlecheck.yml => 6_testintegration_gradlecheck.yml} (95%) diff --git a/.github/actions/5_codeanalysis_detect_modified_plugins/action.yml b/.github/actions/6_codeanalysis_detect_modified_plugins/action.yml similarity index 100% rename from .github/actions/5_codeanalysis_detect_modified_plugins/action.yml rename to .github/actions/6_codeanalysis_detect_modified_plugins/action.yml diff --git a/.github/workflows/5_builderpackage_docs.yml b/.github/workflows/6_builderpackage_docs.yml similarity index 100% rename from .github/workflows/5_builderpackage_docs.yml rename to .github/workflows/6_builderpackage_docs.yml diff --git a/.github/workflows/5_builderpackage_plugins.yml b/.github/workflows/6_builderpackage_plugins.yml similarity index 100% rename from .github/workflows/5_builderpackage_plugins.yml rename to .github/workflows/6_builderpackage_plugins.yml diff --git a/.github/workflows/5_builderpackage_plugins_onpush.yml b/.github/workflows/6_builderpackage_plugins_onpush.yml similarity index 88% rename from .github/workflows/5_builderpackage_plugins_onpush.yml rename to .github/workflows/6_builderpackage_plugins_onpush.yml index 43e71705..7d17e2e0 100644 --- a/.github/workflows/5_builderpackage_plugins_onpush.yml +++ b/.github/workflows/6_builderpackage_plugins_onpush.yml @@ -32,16 +32,18 @@ jobs: # Step to find which project folder contains modified files - name: Detect modified plugins id: detect_changes - uses: ./.github/actions/5_codeanalysis_detect_modified_plugins + uses: ./.github/actions/6_codeanalysis_detect_modified_plugins with: base_branch: ${{ env.base_branch }} call-build-workflow: + permissions: + actions: read needs: modified-plugins strategy: matrix: project: ${{ fromJSON(needs.modified-plugins.outputs.projects) }} - uses: ./.github/workflows/5_builderpackage_plugins.yml + uses: ./.github/workflows/6_builderpackage_plugins.yml secrets: inherit with: id: ${{ github.ref }} diff --git a/.github/workflows/5_builderpackage_templates.yml b/.github/workflows/6_builderpackage_templates.yml similarity index 100% rename from .github/workflows/5_builderpackage_templates.yml rename to .github/workflows/6_builderpackage_templates.yml diff --git a/.github/workflows/5_codequality_changelog.yml b/.github/workflows/6_codequality_changelog.yml similarity index 100% rename from .github/workflows/5_codequality_changelog.yml rename to .github/workflows/6_codequality_changelog.yml diff --git a/.github/workflows/5_codequality_codeql.yml b/.github/workflows/6_codequality_codeql.yml similarity index 100% rename from .github/workflows/5_codequality_codeql.yml rename to .github/workflows/6_codequality_codeql.yml diff --git a/.github/workflows/5_codequality_links.yml b/.github/workflows/6_codequality_links.yml similarity index 100% rename from .github/workflows/5_codequality_links.yml rename to .github/workflows/6_codequality_links.yml diff --git a/.github/workflows/5_testintegration_gradlecheck.yml b/.github/workflows/6_testintegration_gradlecheck.yml similarity index 95% rename from .github/workflows/5_testintegration_gradlecheck.yml rename to .github/workflows/6_testintegration_gradlecheck.yml index 3dce8c1d..a8b3a80b 100644 --- a/.github/workflows/5_testintegration_gradlecheck.yml +++ b/.github/workflows/6_testintegration_gradlecheck.yml @@ -28,7 +28,7 @@ jobs: # Step to find which project folder contains modified files - name: Detect modified plugins id: detect_changes - uses: ./.github/actions/5_codeanalysis_detect_modified_plugins + uses: ./.github/actions/6_codeanalysis_detect_modified_plugins with: base_branch: ${{ github.event.repository.default_branch }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fe313b8..3769befc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,6 +67,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Fix unauthorized request to the Command Manager API [(#394)](https://github.com/wazuh/wazuh-indexer-plugins/pull/394) - Fix Vagrant test environment certificates [(#424)](https://github.com/wazuh/wazuh-indexer-plugins/pull/424) - Fix arguments for the Content Manager's `update` command [(#441)](https://github.com/wazuh/wazuh-indexer-plugins/pull/441) +- Fix `6_builderpackage_plugins_onpush.yml` [(#508)](https://github.com/wazuh/wazuh-indexer-plugins/pull/508) ### Security - Reduce risk of GITHUB_TOKEN exposure[(#485)](https://github.com/wazuh/wazuh-indexer-plugins/pull/485) diff --git a/README.md b/README.md index 73fdedb8..053b48ac 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,10 @@ [![Chat](https://img.shields.io/badge/chat-on%20forums-blue)](https://groups.google.com/forum/#!forum/wazuh) [![Slack](https://img.shields.io/badge/slack-join-blue.svg)](https://wazuh.com/community/join-us-on-slack) [![Documentation](https://img.shields.io/badge/documentation-reference-blue)](https://documentation.wazuh.com) -[![Index templates generator](https://github.com/wazuh/wazuh-indexer-plugins/actions/workflows/5_builderpackage_templates.yml/badge.svg)](https://github.com/wazuh/wazuh-indexer-plugins/actions/workflows/5_builderpackage_templates.yml) -[![Deploy GH pages](https://github.com/wazuh/wazuh-indexer-plugins/actions/workflows/5_builderpackage_docs.yml/badge.svg)](https://github.com/wazuh/wazuh-indexer-plugins/actions/workflows/5_builderpackage_docs.yml) -[![Build](https://github.com/wazuh/wazuh-indexer-plugins/actions/workflows/5_builderpackage_plugins.yml/badge.svg)](https://github.com/wazuh/wazuh-indexer-plugins/actions/workflows/5_builderpackage_plugins.yml) -[![Test](https://github.com/wazuh/wazuh-indexer-plugins/actions/workflows/5_testintegration_gradlecheck.yml/badge.svg)](https://github.com/wazuh/wazuh-indexer-plugins/actions/workflows/5_testintegration_gradlecheck.yml) +[![Index templates generator](https://github.com/wazuh/wazuh-indexer-plugins/actions/workflows/6_builderpackage_templates.yml/badge.svg)](https://github.com/wazuh/wazuh-indexer-plugins/actions/workflows/6_builderpackage_templates.yml) +[![Deploy GH pages](https://github.com/wazuh/wazuh-indexer-plugins/actions/workflows/6_builderpackage_docs.yml/badge.svg)](https://github.com/wazuh/wazuh-indexer-plugins/actions/workflows/6_builderpackage_docs.yml) +[![Build](https://github.com/wazuh/wazuh-indexer-plugins/actions/workflows/6_builderpackage_plugins.yml/badge.svg)](https://github.com/wazuh/wazuh-indexer-plugins/actions/workflows/6_builderpackage_plugins.yml) +[![Test](https://github.com/wazuh/wazuh-indexer-plugins/actions/workflows/6_testintegration_gradlecheck.yml/badge.svg)](https://github.com/wazuh/wazuh-indexer-plugins/actions/workflows/6_testintegration_gradlecheck.yml) - [Welcome!](#welcome) - [Project Resources](#project-resources) diff --git a/docs/dev/build-image.md b/docs/dev/build-image.md index cb728eff..8fda191e 100644 --- a/docs/dev/build-image.md +++ b/docs/dev/build-image.md @@ -66,4 +66,4 @@ Arguments: The script will stop if the credentials are not set, or if any of the required parameters are not provided. -This script is used in the `5_builderpackage_docker.yml` **GitHub Workflow**, which is used to automate the process even more. When possible, **prefer this method**. +This script is used in the `6_builderpackage_docker.yml` **GitHub Workflow**, which is used to automate the process even more. When possible, **prefer this method**.