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.

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

Change master branch references to main #524

Merged
merged 1 commit into from
Feb 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/build_base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ name: Build base
on:
workflow_call:
inputs:
CHECKOUT_TO: # This is the branch to checkout to. Defaults to 'master'
CHECKOUT_TO: # This is the branch to checkout to. Defaults to 'main'
description: 'The branch/tag/commit to checkout to'
required: true
default: ''
default: 'main'
type: string
ARCHITECTURE:
description: 'The architecture to build the package for'
Expand All @@ -18,10 +18,10 @@ on:

workflow_dispatch:
inputs:
CHECKOUT_TO: # This is the branch to checkout to. Defaults to 'master'
CHECKOUT_TO: # This is the branch to checkout to. Defaults to 'main'
description: 'The branch/tag/commit to checkout to'
required: true
default: ''
default: 'main'
ARCHITECTURE:
description: 'The architecture to build the package for'
required: true
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/build_wazuh_dashboard_with_plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@ on:
type: string
description: 'Branch/tag/commit of the wazuh-security-dashboards-plugin repository to build the security plugin'
required: true
default: 'master'
default: 'main'
reference_wazuh_plugins:
type: string
description: 'Branch/tag/commit of the wazuh-dashboard-plugins repository to build the main plugins'
required: true
default: 'master'
default: 'main'
reference_report_plugins:
type: string
description: 'Branch/tag/commit of the wazuh-dashboard-reporting repository to build the report plugin'
required: true
default: 'master'
default: 'main'
is_stage:
type: boolean
description: 'Set production nomenclature'
Expand Down Expand Up @@ -78,15 +78,15 @@ on:
reference_security_plugins:
type: string
required: true
default: 'master'
default: 'main'
reference_wazuh_plugins:
type: string
required: true
default: 'master'
default: 'main'
reference_report_plugins:
type: string
required: true
default: 'master'
default: 'main'
is_stage:
type: boolean
required: true
Expand Down Expand Up @@ -231,29 +231,29 @@ jobs:
build-base:
needs: [validate-job]
name: Build dashboard
uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@master
uses: wazuh/wazuh-dashboard/.github/workflows/build_base.yml@main
with:
CHECKOUT_TO: ${{ github.head_ref || github.ref_name }}
ARCHITECTURE: ${{ inputs.architecture }}

build-main-plugins:
needs: [validate-job]
name: Build plugins
uses: wazuh/wazuh-dashboard-plugins/.github/workflows/manual-build.yml@master
uses: wazuh/wazuh-dashboard-plugins/.github/workflows/manual-build.yml@main
with:
reference: ${{ inputs.reference_wazuh_plugins }}

build-security-plugin:
needs: [validate-job]
name: Build security plugin
uses: wazuh/wazuh-security-dashboards-plugin/.github/workflows/manual-build.yml@master
uses: wazuh/wazuh-security-dashboards-plugin/.github/workflows/manual-build.yml@main
with:
reference: ${{ inputs.reference_security_plugins }}

build-report-plugin:
needs: [validate-job]
name: Build reporting plugin
uses: wazuh/wazuh-dashboards-reporting/.github/workflows/manual-build.yml@master
uses: wazuh/wazuh-dashboards-reporting/.github/workflows/manual-build.yml@main
with:
reference: ${{ inputs.reference_report_plugins }}
build-and-test-package:
Expand Down
8 changes: 4 additions & 4 deletions dev-tools/build-dev-image/wzd.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# docker build \
# --build-arg NODE_VERSION=18.19.0 \
# --build-arg OPENSEARCH_DASHBOARD_VERSION=2.18.0.0 \
# --build-arg WAZUH_DASHBOARD_BRANCH=master \
# --build-arg WAZUH_DASHBOARD_SECURITY_BRANCH=master \
# --build-arg WAZUH_DASHBOARD_REPORTING_BRANCH=master \
# --build-arg WAZUH_DASHBOARD_PLUGINS_BRANCH=master \
# --build-arg WAZUH_DASHBOARD_BRANCH=main \
# --build-arg WAZUH_DASHBOARD_SECURITY_BRANCH=main \
# --build-arg WAZUH_DASHBOARD_REPORTING_BRANCH=main \
# --build-arg WAZUH_DASHBOARD_PLUGINS_BRANCH=main \
# -t quay.io/wazuh/osd-dev:2.18.0 \
# -f wzd.dockerfile .

Expand Down
10 changes: 5 additions & 5 deletions dev-tools/build-packages/base-packages-to-base/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ Example:

```bash
bash run-docker-compose.sh \
--app master \
--base master \
--security master \
--reporting master \
--app main \
--base main \
--security main \
--reporting main \
--arm \
--node-version 18.19.0
```

This example will create a packages folder that inside will have the packages divided by repository of the master branch of each one.
This example will create a packages folder that inside will have the packages divided by repository of the main branch of each one.
Loading