From 82d8cdd66a3f385556b9d53e7596b05a9a487775 Mon Sep 17 00:00:00 2001 From: Tostti Date: Mon, 20 May 2024 15:12:11 +0000 Subject: [PATCH 1/8] Remove reference to branch name in file name --- .github/workflows/build_base.yml | 6 +++--- .github/workflows/build_wazuh_dashboard_with_plugins.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_base.yml b/.github/workflows/build_base.yml index 6b011be45faa..0fac06eaa850 100644 --- a/.github/workflows/build_base.yml +++ b/.github/workflows/build_base.yml @@ -27,8 +27,8 @@ jobs: working-directory: ./artifacts strategy: matrix: - DISTRIBUTION: [ tar.gz ] - ARCHITECTURE: [ x64 ] + DISTRIBUTION: [tar.gz] + ARCHITECTURE: [x64] steps: - name: Checkout code @@ -69,7 +69,7 @@ jobs: - name: Get artifact build name run: | - echo "ARTIFACT_BUILD_NAME=wazuh-dashboard_${{ env.WZD_VERSION }}-${{ env.WZD_REVISION }}_${{ matrix.ARCHITECTURE }}_${{ inputs.CHECKOUT_TO }}.${{ matrix.DISTRIBUTION }}" >> $GITHUB_ENV + echo "ARTIFACT_BUILD_NAME=wazuh-dashboard_${{ env.WZD_VERSION }}-${{ env.WZD_REVISION }}_${{ matrix.ARCHITECTURE }}.${{ matrix.DISTRIBUTION }}" >> $GITHUB_ENV - name: Run bootstrap run: yarn osd bootstrap diff --git a/.github/workflows/build_wazuh_dashboard_with_plugins.yml b/.github/workflows/build_wazuh_dashboard_with_plugins.yml index 384a56908069..6d02819f5c58 100644 --- a/.github/workflows/build_wazuh_dashboard_with_plugins.yml +++ b/.github/workflows/build_wazuh_dashboard_with_plugins.yml @@ -45,7 +45,7 @@ on: required: true default: false id: - description: "ID used to identify the workflow uniquely." + description: 'ID used to identify the workflow uniquely.' type: string required: false @@ -146,7 +146,7 @@ jobs: - name: Setup packages names run: | - echo "WAZUH_DASHBOARD_SLIM=wazuh-dashboard_${{ env.VERSION }}-${{ env.REVISION }}_x64_${{ github.head_ref || github.ref_name }}.tar.gz" >> $GITHUB_ENV + echo "WAZUH_DASHBOARD_SLIM=wazuh-dashboard_${{ env.VERSION }}-${{ env.REVISION }}_x64_.tar.gz" >> $GITHUB_ENV echo "WAZUH_SECURITY_PLUGIN=wazuh-security-dashboards-plugin_${{ env.VERSION }}-${{ env.REVISION }}_${{ inputs.reference_security_plugins }}.zip" >> $GITHUB_ENV echo "WAZUH_PLUGINS=wazuh-dashboard-plugins_${{ env.VERSION }}-${{ env.REVISION }}_${{ inputs.reference_wazuh_plugins }}.zip" >> $GITHUB_ENV if [ "${{ inputs.system }}" = "deb" ]; then From b6eb0ad3ededa31c1a6a19c23c4c8e4f429372cb Mon Sep 17 00:00:00 2001 From: Tostti Date: Mon, 20 May 2024 15:33:56 +0000 Subject: [PATCH 2/8] Modify reference for testing --- .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 6d02819f5c58..4d2f5edf6309 100644 --- a/.github/workflows/build_wazuh_dashboard_with_plugins.yml +++ b/.github/workflows/build_wazuh_dashboard_with_plugins.yml @@ -102,7 +102,7 @@ jobs: build-base: needs: [validate-inputs] name: Build dashboard - uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@4.9.0 + uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@bug/package-generation-branch-with-slash with: CHECKOUT_TO: ${{ github.head_ref || github.ref_name }} From 43e5183698790f49f1dc061136ae8678cd0db57e Mon Sep 17 00:00:00 2001 From: Tostti Date: Mon, 20 May 2024 15:57:17 +0000 Subject: [PATCH 3/8] Remove extra character --- .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 4d2f5edf6309..db93319b2658 100644 --- a/.github/workflows/build_wazuh_dashboard_with_plugins.yml +++ b/.github/workflows/build_wazuh_dashboard_with_plugins.yml @@ -146,7 +146,7 @@ jobs: - name: Setup packages names run: | - echo "WAZUH_DASHBOARD_SLIM=wazuh-dashboard_${{ env.VERSION }}-${{ env.REVISION }}_x64_.tar.gz" >> $GITHUB_ENV + echo "WAZUH_DASHBOARD_SLIM=wazuh-dashboard_${{ env.VERSION }}-${{ env.REVISION }}_x64.tar.gz" >> $GITHUB_ENV echo "WAZUH_SECURITY_PLUGIN=wazuh-security-dashboards-plugin_${{ env.VERSION }}-${{ env.REVISION }}_${{ inputs.reference_security_plugins }}.zip" >> $GITHUB_ENV echo "WAZUH_PLUGINS=wazuh-dashboard-plugins_${{ env.VERSION }}-${{ env.REVISION }}_${{ inputs.reference_wazuh_plugins }}.zip" >> $GITHUB_ENV if [ "${{ inputs.system }}" = "deb" ]; then From 4577a405c5998a9cebd2a4822c49674b0760be63 Mon Sep 17 00:00:00 2001 From: Tostti Date: Mon, 20 May 2024 18:09:14 +0000 Subject: [PATCH 4/8] Return reference to its original name --- .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 db93319b2658..5661710f6e60 100644 --- a/.github/workflows/build_wazuh_dashboard_with_plugins.yml +++ b/.github/workflows/build_wazuh_dashboard_with_plugins.yml @@ -102,7 +102,7 @@ jobs: build-base: needs: [validate-inputs] name: Build dashboard - uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@bug/package-generation-branch-with-slash + uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@4.9.0 with: CHECKOUT_TO: ${{ github.head_ref || github.ref_name }} From 8957e12ccbf968f8805a4f4b2515483ea397a36a Mon Sep 17 00:00:00 2001 From: Tostti Date: Tue, 21 May 2024 14:39:49 +0000 Subject: [PATCH 5/8] Remove unfixable test --- .github/workflows/build_and_test_workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_and_test_workflow.yml b/.github/workflows/build_and_test_workflow.yml index e86e5578bda3..8c4769f92627 100644 --- a/.github/workflows/build_and_test_workflow.yml +++ b/.github/workflows/build_and_test_workflow.yml @@ -139,7 +139,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] #Removed 'windows-latest' - group: [1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 13] + group: [1, 2, 4, 6, 7, 8, 9, 10, 11, 13] include: - os: ubuntu-latest name: Linux From d8de727fec89662f4d7d2dd01fa935dbafb9ab3f Mon Sep 17 00:00:00 2001 From: Tostti Date: Thu, 23 May 2024 12:55:15 +0000 Subject: [PATCH 6/8] Change ubuntu version in test dockerfile --- dev-tools/test-packages/deb/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/test-packages/deb/Dockerfile b/dev-tools/test-packages/deb/Dockerfile index 838dc18e398c..3220241e4a30 100644 --- a/dev-tools/test-packages/deb/Dockerfile +++ b/dev-tools/test-packages/deb/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:latest +FROM ubuntu:jammy ARG PACKAGE RUN mkdir -p /tmp RUN apt-get update --fix-missing From c7481c0eff97d6fae03687b803beec175cbcd6d3 Mon Sep 17 00:00:00 2001 From: Tostti Date: Thu, 23 May 2024 12:55:33 +0000 Subject: [PATCH 7/8] Change reference for testing --- .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 5661710f6e60..db93319b2658 100644 --- a/.github/workflows/build_wazuh_dashboard_with_plugins.yml +++ b/.github/workflows/build_wazuh_dashboard_with_plugins.yml @@ -102,7 +102,7 @@ jobs: build-base: needs: [validate-inputs] name: Build dashboard - uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@4.9.0 + uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@bug/package-generation-branch-with-slash with: CHECKOUT_TO: ${{ github.head_ref || github.ref_name }} From abb405a0414d817b10b82278b006b92d7e4f852d Mon Sep 17 00:00:00 2001 From: Tostti Date: Thu, 23 May 2024 13:58:29 +0000 Subject: [PATCH 8/8] Restore reference --- .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 db93319b2658..5661710f6e60 100644 --- a/.github/workflows/build_wazuh_dashboard_with_plugins.yml +++ b/.github/workflows/build_wazuh_dashboard_with_plugins.yml @@ -102,7 +102,7 @@ jobs: build-base: needs: [validate-inputs] name: Build dashboard - uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@bug/package-generation-branch-with-slash + uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@4.9.0 with: CHECKOUT_TO: ${{ github.head_ref || github.ref_name }}