Skip to content

Commit

Permalink
Change master branch references to main (#7288)
Browse files Browse the repository at this point in the history
  • Loading branch information
asteriscos authored Feb 12, 2025
1 parent 696b514 commit 52b0775
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dev-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
reference:
required: true
type: string
default: master
default: main
description: Source code reference (branch, tag or commit SHA).
command:
required: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/manual-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ on:
reference:
required: true
type: string
default: master
default: main
description: Source code reference (branch, tag or commit SHA)
workflow_dispatch:
inputs:
reference:
required: true
type: string
default: master
default: main
description: Source code reference (branch, tag or commit SHA)

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/playground.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
reference:
required: true
type: string
default: master
default: main
description: Source code reference (branch, tag or commit SHA).
command:
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
reference:
required: true
type: string
default: master
default: main
description: Source code reference (branch, tag or commit SHA)
command:
required: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const Logtest = compose(
// Format the result of the Wazuh API response to an output similar one to the `wazuh-logtest` utility
const formatResult = (result, alert, messages) => {
// How to the `wazuh-logtest` utility logs the output:
// https://github.com/wazuh/wazuh/blob/master/framework/scripts/wazuh-logtest.py#L359-L397
// https://github.com/wazuh/wazuh/blob/v4.3.0/framework/scripts/wazuh-logtest.py#L359-L397

const logging = [];

Expand Down
8 changes: 4 additions & 4 deletions plugins/main/scripts/generate-api-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,14 @@ ${Object.keys(outputs)
function displayExamples() {
// TODO: examples
console.log(`
- Get API data from URL spec file and save to files (API branch master). Run from project root path.
node ${cliFilePath} --spec https://raw.githubusercontent.com/wazuh/wazuh/master/api/api/spec/spec.yaml --output file --output-directory common/api-info
- Get API data from URL spec file and save to files (API branch main). Run from project root path.
node ${cliFilePath} --spec https://raw.githubusercontent.com/wazuh/wazuh/main/api/api/spec/spec.yaml --output file --output-directory common/api-info
- Get API data from URL spec file using the plugin version and save to files. Run from project root path.
node ${cliFilePath} --spec https://raw.githubusercontent.com/wazuh/wazuh/$(node -e \"console.log(require('./package.json').version.split('.').splice(0,2).join('.'))\")/api/api/spec/spec.yaml --output file --output-directory common/api-info
- Unused: Get API data from spec file and print to stdout (API branch master). Run from project root path.
node ${cliFilePath} --spec https://raw.githubusercontent.com/wazuh/wazuh/master/api/api/spec/spec.yaml --output stdout
- Unused: Get API data from spec file and print to stdout (API branch main). Run from project root path.
node ${cliFilePath} --spec https://raw.githubusercontent.com/wazuh/wazuh/main/api/api/spec/spec.yaml --output stdout
`);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ node cli.js --template path/to/template.json

# References

- Wazuh index templates: https://github.com/wazuh/wazuh-indexer-plugins/tree/master/plugins/setup/src/main/resources
- Wazuh index templates: https://github.com/wazuh/wazuh-indexer-plugins/tree/main/plugins/setup/src/main/resources
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fields for the Wazuh indices using different approaches:
## Usage

```console
node build-static-files-get-from-wildcard.js --branch master
node build-static-files-get-from-wildcard.js --branch main
```

By default, this should move the static files to `plugins/wazuh-core/server/initialization/index-pattern-fields` directory that are used to define the initialization tasks related to index patterns.
Expand All @@ -26,7 +26,7 @@ This tool uses under the hood the [CLI](../README.md).
## Usage

```console
node build-static-files-get-from-wildcard.js --branch master
node build-static-files-get-from-wildcard.js --branch main
```

By default, this should move the static files to `plugins/wazuh-core/server/initialization/index-pattern-fields` directory that are used to define the initialization tasks related to index patterns.
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ async function main(input) {

configuration = {
// Default values
branch: 'master',
branch: 'main',
'wazuh-dashboard': 'https://localhost:5601',
'wazuh-indexer': 'https://localhost:9200',
username: 'admin',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function main(input) {

configuration = {
// Default values
branch: 'master',
branch: 'main',
'output-dir': path.join(
__dirname,
'../../../plugins/wazuh-core/server/initialization/index-patterns-fields',
Expand Down

0 comments on commit 52b0775

Please sign in to comment.