Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix error generating packages in branches that contain / #183

Merged
merged 9 commits into from
May 23, 2024
Merged

Fix error generating packages in branches that contain / #183

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
82d8cdd
Remove reference to branch name in file name
Tostti May 20, 2024
b6eb0ad
Modify reference for testing
Tostti May 20, 2024
43e5183
Remove extra character
Tostti May 20, 2024
4577a40
Return reference to its original name
Tostti May 20, 2024
8957e12
Remove unfixable test
Tostti May 21, 2024
51be385
Merge branch '4.9.0' into bug/package-generation-branch-with-slash
Tostti May 23, 2024
d8de727
Change ubuntu version in test dockerfile
Tostti May 23, 2024
c7481c0
Change reference for testing
Tostti May 23, 2024
abb405a
Restore reference
Tostti May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test_workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build_base.yml
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions .github/workflows/build_wazuh_dashboard_with_plugins.yml
View file
Open in desktop
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 @@ -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 }}

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
View file
Open in desktop
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
Loading