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

Review the action of building packages arm #439

Merged
merged 14 commits into from
Dec 16, 2024
Merged

Review the action of building packages arm #439

Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d6e437d
Update WAZUH_DASHBOARD_SLIM filename based on architecture in build w…
guidomodarelli Dec 9, 2024
9b0ca41
Comment out AWS CLI setup and package verification steps in the build…
guidomodarelli Dec 9, 2024
506dd39
Fix copy command in build workflow to remove unnecessary 'ls' command…
guidomodarelli Dec 9, 2024
ca6ff89
Add debugging 'ls' command to check dev-tools directory in Wazuh Dash…
guidomodarelli Dec 9, 2024
5e28337
Update 'ls' command in build workflow to point to the correct output …
guidomodarelli Dec 10, 2024
6e9ada4
Add support for aarch64 architecture option in build-packages script …
guidomodarelli Dec 10, 2024
01906e3
Remove aarch64 option from build-packages script, streamlining archit…
guidomodarelli Dec 10, 2024
e6f94ec
Enhance build workflow by including ARCHITECTURE_FLAG for handling ar…
guidomodarelli Dec 10, 2024
42a9f38
Refactor build workflow to remove ARCHITECTURE_FLAG, simplifying pack…
guidomodarelli Dec 10, 2024
dbcc902
Add artifact upload step in build workflow for package outputs, impro…
guidomodarelli Dec 10, 2024
e79e3fd
Revert "Add artifact upload step in build workflow for package output…
guidomodarelli Dec 12, 2024
b218461
Revert "Comment out AWS CLI setup and package verification steps in t…
guidomodarelli Dec 12, 2024
89e0186
Merge branch '4.10.2' into bug/438-review-the-action-of-building-pack…
Tostti Dec 16, 2024
6f7fdda
Fix S3 upload paths in Wazuh dashboard build workflow to ensure corre…
guidomodarelli Dec 16, 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
15 changes: 11 additions & 4 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 @@ -100,6 +100,7 @@ jobs:
WAZUH_SECURITY_PLUGIN: ${{ steps.setup-variables.outputs.WAZUH_SECURITY_PLUGIN }}
WAZUH_PLUGINS: ${{ steps.setup-variables.outputs.WAZUH_PLUGINS }}
PACKAGE_NAME: ${{ steps.setup-variables.outputs.PACKAGE_NAME }}
ARCHITECTURE_FLAG: ${{ steps.setup-variables.outputs.ARCHITECTURE_FLAG }}
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -116,7 +117,7 @@ jobs:
else
PRODUCTION=""
fi
WAZUH_DASHBOARD_SLIM=wazuh-dashboard_${VERSION}-${REVISION}_x64.tar.gz
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_PLUGINS=wazuh-dashboard-plugins_${VERSION}-${REVISION}_${{ inputs.reference_wazuh_plugins }}.zip
if [ "${{ inputs.system }}" = "deb" ]; then
Expand All @@ -132,6 +133,11 @@ jobs:
PACKAGE_NAME=wazuh-dashboard_${VERSION}-${{ inputs.revision }}_${{ inputs.architecture }}_${COMMIT_SHA}.rpm
fi
fi
if [[ "${{ inputs.architecture }}" == "x86_64" || "${{ inputs.architecture }}" == "amd64" ]]; then
ARCHITECTURE_FLAG=""
else
ARCHITECTURE_FLAG=--arm
fi
echo "CURRENT_DIR=$CURRENT_DIR" >> $GITHUB_OUTPUT
echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
echo "REVISION=$REVISION" >> $GITHUB_OUTPUT
Expand All @@ -141,6 +147,7 @@ jobs:
echo "WAZUH_SECURITY_PLUGIN=$WAZUH_SECURITY_PLUGIN" >> $GITHUB_OUTPUT
echo "WAZUH_PLUGINS=$WAZUH_PLUGINS" >> $GITHUB_OUTPUT
echo "PACKAGE_NAME=$PACKAGE_NAME" >> $GITHUB_OUTPUT
echo "ARCHITECTURE_FLAG=$ARCHITECTURE_FLAG" >> $GITHUB_OUTPUT

validate-job:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -242,7 +249,7 @@ jobs:
cd ${{ needs.setup-variables.outputs.CURRENT_DIR }}/dev-tools/build-packages
bash ./build-packages.sh \
-v ${{ needs.setup-variables.outputs.VERSION }} \
-r ${{ inputs.revision }} \
-r ${{ inputs.revision }} ${{ needs.setup-variables.outputs.ARCHITECTURE_FLAG }} \
-a file://${{needs.setup-variables.outputs.CURRENT_DIR}}/artifacts/wazuh-package.zip \
-s file://${{needs.setup-variables.outputs.CURRENT_DIR}}/artifacts/security-package.zip \
-b file://${{needs.setup-variables.outputs.CURRENT_DIR}}/artifacts/dashboard-package.zip \
Expand All @@ -251,8 +258,8 @@ jobs:
- name: Test package
run: |
cd ${{ needs.setup-variables.outputs.CURRENT_DIR }}/dev-tools/test-packages
ls -la ${{ needs.setup-variables.outputs.CURRENT_DIR }}/dev-tools/build-packages/output/${{ inputs.system }}
cp ${{ needs.setup-variables.outputs.CURRENT_DIR }}/dev-tools/build-packages/output/${{ inputs.system }}/${{needs.setup-variables.outputs.PACKAGE_NAME}} ${{ needs.setup-variables.outputs.CURRENT_DIR }}/dev-tools/test-packages/${{ inputs.system }}
ls -laR ${{ needs.setup-variables.outputs.CURRENT_DIR }}/dev-tools/build-packages/output
cp ${{ needs.setup-variables.outputs.CURRENT_DIR }}/dev-tools/build-packages/output/${{needs.setup-variables.outputs.PACKAGE_NAME}} ${{ needs.setup-variables.outputs.CURRENT_DIR }}/dev-tools/test-packages/${{ inputs.system }}
bash ./test-packages.sh \
-p ${{needs.setup-variables.outputs.PACKAGE_NAME}}

Expand Down
Loading