From 71b3edaa9e5379a2268541b8ab9e0e0e0d4adcbb Mon Sep 17 00:00:00 2001 From: Nicolas Agustin Guevara Pihen <42900763+Tostti@users.noreply.github.com> Date: Thu, 23 May 2024 15:28:44 -0300 Subject: [PATCH] Fix error generating packages in branches that contain `/` (#183) --- .github/workflows/build_and_test_workflow.yml | 2 +- .github/workflows/build_base.yml | 6 +++--- .github/workflows/build_wazuh_dashboard_with_plugins.yml | 4 ++-- dev-tools/test-packages/deb/Dockerfile | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) 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 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..5661710f6e60 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 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