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

fix: publish conditions #339

Merged
merged 3 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
16 changes: 16 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
### Description

(PR description goes here)

### Checklist

- [ ] `README.md` has been updated or is not required
- [ ] push trigger tests
kdoroszko-splunk marked this conversation as resolved.
Show resolved Hide resolved
- [ ] manual release test
- [ ] automated releaes test
- [ ] pull request trigger tests
- [ ] schedule trigger tests
- [ ] workflow errors/warnings reviewed and addressed
mkolasinski-splunk marked this conversation as resolved.
Show resolved Hide resolved

### Testing done
(for each selected checkbox, the corresponding test results link should be listed here)
5 changes: 3 additions & 2 deletions .github/workflows/reusable-build-test-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2333,7 +2333,7 @@ jobs:
summary-scripted*

pre-publish:
if: ${{ !cancelled() && needs.validate-custom-version.result == 'success' }}
if: ${{ !cancelled() }}
# The following line will rename 'pre-publish' to 'pre-publish-not_main_pr' when PR is created towards main branch
# It is necessary to avoid confusion caused by githubactions considering pre-publish for both push to develop branch
# and pull_request to main branch events.
Expand Down Expand Up @@ -2377,8 +2377,9 @@ jobs:

publish:
if: |
(!cancelled() && needs.pre-publish.result == 'success' && github.event_name != 'pull_request' && github.event_name != 'schedule') ||
(!cancelled() && needs.pre-publish.result == 'success' && github.event_name == 'push' && github.event.inputs.custom-version == '') ||
mkolasinski-splunk marked this conversation as resolved.
Show resolved Hide resolved
(!cancelled() && needs.pre-publish.result == 'success' && github.event.inputs.custom-version != '' && needs.validate-custom-version.result == 'success')
# First condition for standard release process, second one for manual custom-version release process
name: ${{ github.event.inputs.custom-version == '' && 'publish' || 'publish-custom-version' }}

needs:
Expand Down
14 changes: 13 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,25 @@ Workflow defines jobs which perform security code scanning, execute different ty
* If bugfix release is needed:
* make a change
* test it
* pull-request scenario
* push scenario
* release scenario (test-addonfactory-repository)
* create a PR to the `main` branch
* get all the approvals from the team
* merge it using "squash commit" option
* backport the change back to the `develop` branch
* new version of the workflow is going to be released (v4.17.0 (before) -> v4.17.1 (after)) and it will automatically applied to all the repositories

# Troubleshooting for different workflow stages in GitHub Actions
# Workflow jobs

## Inputs
* marker - list of markers used to paralelize modinput tests
* ui_marker - list of markers used to paralelize ui tests
* custom-version - version used for release on manual workflow trigger
* execute-tests-on-push-to-release - enable tests on release branch - default false
* k8s-enfironment - k8s environment for testing
* k8s-manifests-branch - k8s-manifests branch for testing
* scripted-inputs-os-list - list of OSes used for scripted inputs tests

## General troubleshooting

Expand Down
Loading