Skip to content

chore(release): merge develop to main #398

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

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open

Conversation

siddharth-khatsuriya
Copy link
Contributor

@siddharth-khatsuriya siddharth-khatsuriya commented May 13, 2025

Description

Changes in the PR:

Checklist

  • README.md has been updated or is not required
  • push trigger tests
  • manual release test
  • automated releases test
  • pull request trigger tests
  • schedule trigger tests
  • workflow errors/warnings reviewed and addressed

Testing done

(for each selected checkbox, the corresponding test results link should be listed here)

mgrandys-splunk and others added 7 commits March 6, 2025 11:37
### Description
Run `appinspect api` job for `release/` branches in `build-test-release`
pipeline
Ticket: https://splunk.atlassian.net/browse/ADDON-77779

Tested in the following cases where appinspect api job is:
- Running for PR with “release/“ base:
https://github.com/splunk/splunk-add-on-for-microsoft-cloud-services/actions/runs/13626390125
- Running for manual trigger on “release/“ branch:
https://github.com/splunk/splunk-add-on-for-microsoft-cloud-services/actions/runs/13626413937
- Not running for chore/ branch:
https://github.com/splunk/splunk-add-on-for-microsoft-cloud-services/actions/runs/13626445165

### Checklist

- [ ] `README.md` has been updated or is not required
- [ ] push trigger tests
- [ ] manual release test
- [ ] automated releases test
- [ ] pull request trigger tests
- [ ] schedule trigger tests
- [ ] workflow errors/warnings reviewed and addressed

### Testing done 
(for each selected checkbox, the corresponding test results link should
be listed here)
### Description

[ [ADDON-78394](https://splunk.atlassian.net/browse/ADDON-78394) ] Added
conditions skip tests, build, app-inspect and publish if the changes in
PR are only related to documentation.

Tests:
https://docs.google.com/document/d/1IFxbIwzDM0lBkO3ciNxFrPlOPPE9YQhcaVStQg7lYEM/edit?usp=sharing

### Checklist

- [ ] `README.md` has been updated or is not required
- [ ] push trigger tests
- [ ] manual release test
- [ ] automated releases test
- [ ] pull request trigger tests
- [ ] schedule trigger tests
- [ ] workflow errors/warnings reviewed and addressed

### Testing done 
(for each selected checkbox, the corresponding test results link should
be listed here)
### Description

Added a new job validate-docs-change.
This job will attempt to serve the documentation and fail if there are
any errors.
If errors occur, they will be printed in the check logs step.

Another stage, enforce-docs-changes, reviews the result of
validate-docs-change and uses run metadata to determine whether the job
should fail the pipeline.

When the PR targets the main branch, enforce-docs-changes will enforce
failure on broken documentation and block merge.
For other branches, it serves as an indicator of documentation issues
without blocking the merge.

### Checklist

- [ ] `README.md` has been updated or is not required
- [ ] push trigger tests
- [ ] manual release test
- [ ] automated releases test
- [ ] pull request trigger tests
- [ ] schedule trigger tests
- [ ] workflow errors/warnings reviewed and addressed

### Testing done 
(for each selected checkbox, the corresponding test results link should
be listed here)
### Description
This PR bumps the k8s-manifests-branch version from v3.3.2 to v3.4.1
related PR:
splunk/ta-automation-k8s-manifests#120

### Checklist

- [ ] `README.md` has been updated or is not required
- [ ] push trigger tests
- [ ] manual release test
- [ ] automated releases test
- [ ] pull request trigger tests
- [ ] schedule trigger tests
- [ ] workflow errors/warnings reviewed and addressed

### Testing done 
-
https://github.com/splunk/splunk-add-on-for-unix-and-linux/actions/runs/14701563721

---------

Co-authored-by: Dmytro Kvashnin <[email protected]>
### Description

I think it makes more sense to make a fix release each time we update
appinspect version. We'd prevent ourselves from rolling out the template
each time there is a feat release of appinspect.

### Checklist

- [ ] `README.md` has been updated or is not required
- [ ] push trigger tests
- [ ] manual release test
- [ ] automated releases test
- [ ] pull request trigger tests
- [ ] schedule trigger tests
- [ ] workflow errors/warnings reviewed and addressed

### Testing done 
No tests are needed
### Description

update appinspect-cli-action to 2.10

### Checklist

- [ ] `README.md` has been updated or is not required
- [ ] push trigger tests
- [ ] manual release test
- [ ] automated releases test
- [ ] pull request trigger tests
- [ ] schedule trigger tests
- [ ] workflow errors/warnings reviewed and addressed

### Testing done 
(for each selected checkbox, the corresponding test results link should
be listed here)
@siddharth-khatsuriya siddharth-khatsuriya self-assigned this May 13, 2025
@github-actions github-actions bot locked and limited conversation to collaborators May 13, 2025
siddharth-khatsuriya and others added 8 commits May 13, 2025 12:33
###
The file `.github/workflows/reusable-build-test-release.yml` had merge
conflicts when merging develop into main.
This PR resolves those conflicts and syncs the changes accordingly.

---------

Co-authored-by: mkolasinski-splunk <[email protected]>
Co-authored-by: Dmytro Kvashnin <[email protected]>
Co-authored-by: Dmytro Kvashnin <[email protected]>
Co-authored-by: mgrandys-splunk <[email protected]>
Co-authored-by: dvarasani-crest <[email protected]>
Co-authored-by: kdoroszko-splunk <[email protected]>
### Description
Run `appinspect api` job for `release/` branches in `build-test-release`
pipeline
Ticket: https://splunk.atlassian.net/browse/ADDON-77779

Tested in the following cases where appinspect api job is:
- Running for PR with “release/“ base:
https://github.com/splunk/splunk-add-on-for-microsoft-cloud-services/actions/runs/13626390125
- Running for manual trigger on “release/“ branch:
https://github.com/splunk/splunk-add-on-for-microsoft-cloud-services/actions/runs/13626413937
- Not running for chore/ branch:
https://github.com/splunk/splunk-add-on-for-microsoft-cloud-services/actions/runs/13626445165

### Checklist

- [ ] `README.md` has been updated or is not required
- [ ] push trigger tests
- [ ] manual release test
- [ ] automated releases test
- [ ] pull request trigger tests
- [ ] schedule trigger tests
- [ ] workflow errors/warnings reviewed and addressed

### Testing done 
(for each selected checkbox, the corresponding test results link should
be listed here)
### Description

[ [ADDON-78394](https://splunk.atlassian.net/browse/ADDON-78394) ] Added
conditions skip tests, build, app-inspect and publish if the changes in
PR are only related to documentation.

Tests:
https://docs.google.com/document/d/1IFxbIwzDM0lBkO3ciNxFrPlOPPE9YQhcaVStQg7lYEM/edit?usp=sharing

### Checklist

- [ ] `README.md` has been updated or is not required
- [ ] push trigger tests
- [ ] manual release test
- [ ] automated releases test
- [ ] pull request trigger tests
- [ ] schedule trigger tests
- [ ] workflow errors/warnings reviewed and addressed

### Testing done 
(for each selected checkbox, the corresponding test results link should
be listed here)
### Description

Added a new job validate-docs-change.
This job will attempt to serve the documentation and fail if there are
any errors.
If errors occur, they will be printed in the check logs step.

Another stage, enforce-docs-changes, reviews the result of
validate-docs-change and uses run metadata to determine whether the job
should fail the pipeline.

When the PR targets the main branch, enforce-docs-changes will enforce
failure on broken documentation and block merge.
For other branches, it serves as an indicator of documentation issues
without blocking the merge.

### Checklist

- [ ] `README.md` has been updated or is not required
- [ ] push trigger tests
- [ ] manual release test
- [ ] automated releases test
- [ ] pull request trigger tests
- [ ] schedule trigger tests
- [ ] workflow errors/warnings reviewed and addressed

### Testing done 
(for each selected checkbox, the corresponding test results link should
be listed here)
This PR bumps the k8s-manifests-branch version from v3.3.2 to v3.4.1
related PR:
splunk/ta-automation-k8s-manifests#120

- [ ] `README.md` has been updated or is not required
- [ ] push trigger tests
- [ ] manual release test
- [ ] automated releases test
- [ ] pull request trigger tests
- [ ] schedule trigger tests
- [ ] workflow errors/warnings reviewed and addressed

-
https://github.com/splunk/splunk-add-on-for-unix-and-linux/actions/runs/14701563721

---------

Co-authored-by: Dmytro Kvashnin <[email protected]>
### Description

I think it makes more sense to make a fix release each time we update
appinspect version. We'd prevent ourselves from rolling out the template
each time there is a feat release of appinspect.

### Checklist

- [ ] `README.md` has been updated or is not required
- [ ] push trigger tests
- [ ] manual release test
- [ ] automated releases test
- [ ] pull request trigger tests
- [ ] schedule trigger tests
- [ ] workflow errors/warnings reviewed and addressed

### Testing done 
No tests are needed
### Description

update appinspect-cli-action to 2.10

### Checklist

- [ ] `README.md` has been updated or is not required
- [ ] push trigger tests
- [ ] manual release test
- [ ] automated releases test
- [ ] pull request trigger tests
- [ ] schedule trigger tests
- [ ] workflow errors/warnings reviewed and addressed

### Testing done 
(for each selected checkbox, the corresponding test results link should
be listed here)
###
The file `.github/workflows/reusable-build-test-release.yml` had merge
conflicts when merging develop into main.
This PR resolves those conflicts and syncs the changes accordingly.

---------

Co-authored-by: mkolasinski-splunk <[email protected]>
Co-authored-by: Dmytro Kvashnin <[email protected]>
Co-authored-by: Dmytro Kvashnin <[email protected]>
Co-authored-by: mgrandys-splunk <[email protected]>
Co-authored-by: dvarasani-crest <[email protected]>
Co-authored-by: kdoroszko-splunk <[email protected]>
### Description

(PR description goes here)

### Checklist

- [ ] `README.md` has been updated or is not required
- [ ] push trigger tests
- [ ] manual release test
- [ ] automated releases test
- [ ] pull request trigger tests
- [ ] schedule trigger tests
- [ ] workflow errors/warnings reviewed and addressed

### Testing done 
(for each selected checkbox, the corresponding test results link should
be listed here)

---------

Co-authored-by: mkolasinski-splunk <[email protected]>
Co-authored-by: Dmytro Kvashnin <[email protected]>
Co-authored-by: Dmytro Kvashnin <[email protected]>
Co-authored-by: mgrandys-splunk <[email protected]>
Co-authored-by: dvarasani-crest <[email protected]>
Co-authored-by: kdoroszko-splunk <[email protected]>
@siddharth-khatsuriya siddharth-khatsuriya changed the title fix: update AppInspect CLI action to v2.10 chore(release): merge develop to main May 13, 2025
@siddharth-khatsuriya siddharth-khatsuriya marked this pull request as ready for review May 13, 2025 12:25
@siddharth-khatsuriya siddharth-khatsuriya requested a review from a team as a code owner May 13, 2025 12:25
siddharth-khatsuriya and others added 2 commits May 26, 2025 18:12
…" (#404)

This reverts commit e30a821.

### Description

This PR reverts the previous implementation of documentation validation
and enforcement, and reintroduces those capabilities using a **reusable
GitHub Actions workflow** along with a **template
`validate-deploy-docs.yml` workflow file** in the template repository.

## Changes with PR reference

- Removes the hardcoded docs validation logic.
- Changes related to document validation and deployment is made in this
PR: splunk/addonfactory-repository-template#743

### Checklist

- [ ] `README.md` has been updated or is not required
- [ ] push trigger tests
- [ ] manual release test
- [ ] automated releases test
- [ ] pull request trigger tests
- [ ] schedule trigger tests
- [ ] workflow errors/warnings reviewed and addressed

### Testing done 
(for each selected checkbox, the corresponding test results link should
be listed here)
### Description

Update develop to be inline with main branch.

### Checklist

- [ ] `README.md` has been updated or is not required
- [ ] push trigger tests
- [ ] manual release test
- [ ] automated releases test
- [ ] pull request trigger tests
- [ ] schedule trigger tests
- [ ] workflow errors/warnings reviewed and addressed

### Testing done 
(for each selected checkbox, the corresponding test results link should
be listed here)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants