Skip to content

Commit

Permalink
Fix error generating packages in branches that contain / (#183)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tostti authored and yenienserrano committed Aug 19, 2024
1 parent b98089e commit 05dc30b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build_base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
working-directory: ./artifacts
strategy:
matrix:
DISTRIBUTION: [ tar.gz ]
ARCHITECTURE: [ x64 ]
DISTRIBUTION: [tar.gz]
ARCHITECTURE: [x64]

steps:
- name: Checkout code
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_wazuh_dashboard_with_plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/test-packages/deb/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:latest
FROM ubuntu:jammy
ARG PACKAGE
RUN mkdir -p /tmp
RUN apt-get update --fix-missing
Expand Down

0 comments on commit 05dc30b

Please sign in to comment.