Skip to content

Commit

Permalink
Merge branch 'main' into ci/net_int_action
Browse files Browse the repository at this point in the history
  • Loading branch information
roverflow authored Oct 16, 2024
2 parents 54ffd0a + 8fb3a8b commit f723c56
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.x"
- uses: pre-commit/action@v3.0.1

check:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repos:
- id: codespell

- repo: https://github.com/pre-commit/pre-commit-hooks.git
rev: v4.6.0
rev: v5.0.0
hooks:
- id: end-of-file-fixer
- id: trailing-whitespace
Expand Down
8 changes: 3 additions & 5 deletions docs/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Example showing how only Automation hub release can be made, only `ah_token` wou

### Release on AH only, workflow

Filename: `release.yaml`
Filename: `release_ah.yaml`

```
---
Expand All @@ -58,7 +58,7 @@ Same for galaxy releases only, please refer to the `release_galay.yaml` and spec

### Release on Galaxy only, workflow

Filename: `release.yaml`
Filename: `release_galaxy.yaml`

```
---
Expand All @@ -73,11 +73,9 @@ jobs:
with:
environment: release
secrets:
ah_token: ${{ secrets.ANSIBLE_GALAXY_API_KEY }}
ansible_galaxy_api_key: ${{ secrets.ANSIBLE_GALAXY_API_KEY }}
```

Same for galaxy releases only, please refer to the `release_galay.yaml` and specify `ansible_galaxy_api_key` secret.

## Detailed release process

### Things to make sure of before release:
Expand Down

0 comments on commit f723c56

Please sign in to comment.