From 23355d7a4e4d64965cfc293eb0c6b7f68f9b1538 Mon Sep 17 00:00:00 2001 From: Nicolas Agustin Guevara Pihen Date: Fri, 29 Nov 2024 14:11:57 -0300 Subject: [PATCH 1/3] Add support for / --- .../build_wazuh_dashboard_with_plugins.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_wazuh_dashboard_with_plugins.yml b/.github/workflows/build_wazuh_dashboard_with_plugins.yml index 9518bfe52e4e..f546f795462d 100644 --- a/.github/workflows/build_wazuh_dashboard_with_plugins.yml +++ b/.github/workflows/build_wazuh_dashboard_with_plugins.yml @@ -158,9 +158,9 @@ jobs: PRODUCTION="" fi WAZUH_DASHBOARD_SLIM=wazuh-dashboard_${VERSION}-${REVISION}_${{ (inputs.ARCHITECTURE == 'x86_64' || inputs.ARCHITECTURE == 'amd64') && 'x64' || 'arm64' }}.tar.gz - WAZUH_SECURITY_PLUGIN=wazuh-security-dashboards-plugin_${VERSION}-${REVISION}_${{ inputs.reference_security_plugins }}.zip - WAZUH_REPORT_PLUGIN=reports-dashboards_${VERSION}-${REVISION}_${{ inputs.reference_report_plugins }}.zip - WAZUH_PLUGINS=wazuh-dashboard-plugins_${VERSION}-${REVISION}_${{ inputs.reference_wazuh_plugins }}.zip + WAZUH_SECURITY_PLUGIN=wazuh-security-dashboards-plugin_${VERSION}-${REVISION}_$(echo ${{ inputs.reference_security_plugins }} | sed 's/\//-/g').zip + WAZUH_REPORT_PLUGIN=reports-dashboards_${VERSION}-${REVISION}_$(echo ${{ inputs.reference_report_plugins }} | sed 's/\//-/g').zip + WAZUH_PLUGINS_WAZUH=wazuh-dashboard-plugins_${VERSION}-${REVISION}_$(echo ${{ inputs.reference_wazuh_plugins }} | sed 's/\//-/g').zip if [ "${{ inputs.system }}" = "deb" ]; then if [ "${{ inputs.is_stage }}" = "true" ]; then PACKAGE_NAME=wazuh-dashboard_${VERSION}-${{ inputs.revision }}_${{ inputs.architecture }}.deb @@ -222,7 +222,7 @@ jobs: build-base: needs: [validate-job] name: Build dashboard - uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@master + uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@bug/432-support-branches-with-slash with: CHECKOUT_TO: ${{ github.head_ref || github.ref_name }} ARCHITECTURE: ${{ inputs.architecture }} @@ -230,21 +230,21 @@ jobs: build-main-plugins: needs: [validate-job] name: Build plugins - uses: wazuh/wazuh-dashboard-plugins/.github/workflows/manual-build.yml@master + uses: wazuh/wazuh-dashboard-plugins/.github/workflows/manual-build.yml@bug/432-support-branches-with-slash with: reference: ${{ inputs.reference_wazuh_plugins }} build-security-plugin: needs: [validate-job] name: Build security plugin - uses: wazuh/wazuh-security-dashboards-plugin/.github/workflows/manual-build.yml@master + uses: wazuh/wazuh-security-dashboards-plugin/.github/workflows/manual-build.yml@bug/432-support-branches-with-slash with: reference: ${{ inputs.reference_security_plugins }} build-report-plugin: needs: [validate-job] name: Build reporting plugin - uses: wazuh/wazuh-dashboards-reporting/.github/workflows/manual-build.yml@master + uses: wazuh/wazuh-dashboards-reporting/.github/workflows/manual-build.yml@bug/432-support-branches-with-slash with: reference: ${{ inputs.reference_report_plugins }} build-and-test-package: From 090ddbb4834ab458ad34eaa0b562960245268177 Mon Sep 17 00:00:00 2001 From: Nicolas Agustin Guevara Pihen Date: Fri, 29 Nov 2024 14:12:37 -0300 Subject: [PATCH 2/3] Fix typo --- .github/workflows/build_wazuh_dashboard_with_plugins.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_wazuh_dashboard_with_plugins.yml b/.github/workflows/build_wazuh_dashboard_with_plugins.yml index f546f795462d..bec3fbb4e921 100644 --- a/.github/workflows/build_wazuh_dashboard_with_plugins.yml +++ b/.github/workflows/build_wazuh_dashboard_with_plugins.yml @@ -160,7 +160,7 @@ jobs: WAZUH_DASHBOARD_SLIM=wazuh-dashboard_${VERSION}-${REVISION}_${{ (inputs.ARCHITECTURE == 'x86_64' || inputs.ARCHITECTURE == 'amd64') && 'x64' || 'arm64' }}.tar.gz WAZUH_SECURITY_PLUGIN=wazuh-security-dashboards-plugin_${VERSION}-${REVISION}_$(echo ${{ inputs.reference_security_plugins }} | sed 's/\//-/g').zip WAZUH_REPORT_PLUGIN=reports-dashboards_${VERSION}-${REVISION}_$(echo ${{ inputs.reference_report_plugins }} | sed 's/\//-/g').zip - WAZUH_PLUGINS_WAZUH=wazuh-dashboard-plugins_${VERSION}-${REVISION}_$(echo ${{ inputs.reference_wazuh_plugins }} | sed 's/\//-/g').zip + WAZUH_PLUGINS=wazuh-dashboard-plugins_${VERSION}-${REVISION}_$(echo ${{ inputs.reference_wazuh_plugins }} | sed 's/\//-/g').zip if [ "${{ inputs.system }}" = "deb" ]; then if [ "${{ inputs.is_stage }}" = "true" ]; then PACKAGE_NAME=wazuh-dashboard_${VERSION}-${{ inputs.revision }}_${{ inputs.architecture }}.deb From aa24b854ba9f53cee3160da17c5409097d006963 Mon Sep 17 00:00:00 2001 From: Nicolas Agustin Guevara Pihen Date: Fri, 29 Nov 2024 15:21:20 -0300 Subject: [PATCH 3/3] Restore references to master --- .github/workflows/build_wazuh_dashboard_with_plugins.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_wazuh_dashboard_with_plugins.yml b/.github/workflows/build_wazuh_dashboard_with_plugins.yml index bec3fbb4e921..3fddf70ea598 100644 --- a/.github/workflows/build_wazuh_dashboard_with_plugins.yml +++ b/.github/workflows/build_wazuh_dashboard_with_plugins.yml @@ -222,7 +222,7 @@ jobs: build-base: needs: [validate-job] name: Build dashboard - uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@bug/432-support-branches-with-slash + uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@master with: CHECKOUT_TO: ${{ github.head_ref || github.ref_name }} ARCHITECTURE: ${{ inputs.architecture }} @@ -230,21 +230,21 @@ jobs: build-main-plugins: needs: [validate-job] name: Build plugins - uses: wazuh/wazuh-dashboard-plugins/.github/workflows/manual-build.yml@bug/432-support-branches-with-slash + uses: wazuh/wazuh-dashboard-plugins/.github/workflows/manual-build.yml@master with: reference: ${{ inputs.reference_wazuh_plugins }} build-security-plugin: needs: [validate-job] name: Build security plugin - uses: wazuh/wazuh-security-dashboards-plugin/.github/workflows/manual-build.yml@bug/432-support-branches-with-slash + uses: wazuh/wazuh-security-dashboards-plugin/.github/workflows/manual-build.yml@master with: reference: ${{ inputs.reference_security_plugins }} build-report-plugin: needs: [validate-job] name: Build reporting plugin - uses: wazuh/wazuh-dashboards-reporting/.github/workflows/manual-build.yml@bug/432-support-branches-with-slash + uses: wazuh/wazuh-dashboards-reporting/.github/workflows/manual-build.yml@master with: reference: ${{ inputs.reference_report_plugins }} build-and-test-package: