Skip to content

Commit

Permalink
Merge pull request #190 from ASFHyP3/develop
Browse files Browse the repository at this point in the history
Release v0.12.0
  • Loading branch information
AndrewPlayer3 authored Oct 15, 2024
2 parents aac616b + 457a2b5 commit b05df4d
Show file tree
Hide file tree
Showing 14 changed files with 56 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ on:
- develop
jobs:
call-changelog-check-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
2 changes: 1 addition & 1 deletion .github/workflows/create-jira-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
call-create-jira-issue-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
secrets:
JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/labeled-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ on:

jobs:
call-labeled-pr-check-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
19 changes: 19 additions & 0 deletions .github/workflows/notify-downstream.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Notify Downstream of New Release

on:
release:
types:
- released

jobs:
update-docs:
runs-on: ubuntu-latest
steps:
- name: Bump Actions version in HyP3 Cookiecutter
uses: benc-uk/[email protected]
with:
workflow: update_actions_version.yml
token: ${{ secrets.TOOLS_BOT_PAK }}
repo: ASFHyP3/hyp3-cookiecutter
ref: develop
inputs: '{"version": "${{ github.event.release.tag_name }}"}'
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
call-release-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
with:
release_prefix: Actions
secrets:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/reusable-docker-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ on:
required: false
default: tools-bot
type: string
file:
required: false
default: Dockerfile
type: string
secrets:
USER_TOKEN:
required: true
Expand Down Expand Up @@ -50,6 +54,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: .
file: ./${{ inputs.file }}
push: ${{ ! github.event.pull_request.head.repo.fork }}
tags: |
ghcr.io/${{ env.REPO }}:${{ inputs.version_tag }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: mamba-org/setup-micromamba@v1
- uses: mamba-org/setup-micromamba@v2
with:
environment-file: environment.yml
create-args: >-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-secrets-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
fetch-depth: 0

- name: Secret Scanning
uses: trufflesecurity/trufflehog@v3.78.2
uses: trufflesecurity/trufflehog@v3.82.6
with:
base: main
extra_args: --only-verified
2 changes: 1 addition & 1 deletion .github/workflows/reusable-version-info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
with:
fetch-depth: 0

- uses: mamba-org/setup-micromamba@v1
- uses: mamba-org/setup-micromamba@v2
with:
environment-file: environment.yml
create-args: >-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ on: push

jobs:
call-secrets-analysis-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
2 changes: 1 addition & 1 deletion .github/workflows/tag-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ on:

jobs:
call-bump-version-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
secrets:
USER_TOKEN: ${{ secrets.TOOLS_BOT_PAK }}
2 changes: 1 addition & 1 deletion .github/workflows/update-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:

jobs:
call-git-object-name-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2

upate_actions_examples:
needs: call-git-object-name-workflow
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [PEP 440](https://www.python.org/dev/peps/pep-0440/)
and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.12.0]
### Added
- Releases of ASFHyP3/actions will now trigger updates to the ASFHyP3/hyp3-cookiecutter
- Optional ability to specify the name of the dockerfile to build with the `reusable-docker-ghcr` action.

## [0.11.2]

### Changed
Expand Down
33 changes: 17 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
call-bump-version-workflow:
# For first-time setup, create a v0.0.0 tag as shown here:
# https://github.com/ASFHyP3/actions#reusable-bump-versionyml
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
with:
user: tools-bot # Optional; default shown
email: [email protected] # Optional; default shown
Expand Down Expand Up @@ -68,7 +68,7 @@ on:
jobs:
call-changelog-check-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
```

to ensure the changelog has been updated for any PR to `develop` or `main`.
Expand All @@ -86,7 +86,7 @@ on:
jobs:
call-create-jira-issue-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
secrets:
JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
Expand Down Expand Up @@ -139,13 +139,13 @@ on:
jobs:
call-version-info-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
with:
conda_env_name: hyp3-plugin
call-docker-ecr-workflow:
needs: call-version-info-workflow
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
with:
version_tag: ${{ needs.call-version-info-workflow.outputs.version_tag }}
ecr_registry: 845172464411.dkr.ecr.us-west-2.amazonaws.com
Expand Down Expand Up @@ -180,18 +180,19 @@ on:
jobs:
call-version-info-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
with:
conda_env_name: hyp3-plugin
call-docker-ghcr-workflow:
needs: call-version-info-workflow
uses: ASFHyP3/actions/.github/workflows/reusable-docker-ghcr.yml@v0.11.1
uses: ASFHyP3/actions/.github/workflows/reusable-docker-ghcr.yml@v0.12.0
with:
version_tag: ${{ needs.call-version-info-workflow.outputs.version_tag }}
user: ${{ github.actor }}
release_branch: main # Optional; default shown
develop_branch: develop # Optional; default shown
file: Dockerfile # Optional; default shown
secrets:
USER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
```
Expand All @@ -207,7 +208,7 @@ on: push
jobs:
call-flake8-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
with:
local_package_names: hyp3_plugin # Required; comma-seperated list of names that should be considered local to your application
excludes: hyp3_plugin/ugly.py # Optional; comma-separated list of glob patterns to exclude from checks
Expand All @@ -226,7 +227,7 @@ on: push
jobs:
call-ruff-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
```

to ensure the Python code is styled correctly.
Expand Down Expand Up @@ -284,7 +285,7 @@ on:
jobs:
call-git-object-name-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
echo-git-object-name-outputs:
needs: call-git-object-name-workflow
Expand Down Expand Up @@ -314,7 +315,7 @@ on:
jobs:
call-labeled-pr-check-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
```
to ensure a release label is included on any PR to `main`.

Expand All @@ -338,7 +339,7 @@ on:
jobs:
call-pytest-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
with:
local_package_name: hyp3_plugin # Required; package to produce a coverage report for
fail_fast: false # Optional; default shown
Expand Down Expand Up @@ -367,7 +368,7 @@ on:
jobs:
call-release-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
with:
release_prefix: HyP3-CI
release_branch: main # Optional; default shown
Expand Down Expand Up @@ -396,7 +397,7 @@ on:
jobs:
call-release-checklist-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
permissions:
pull-requests: write
with:
Expand Down Expand Up @@ -426,7 +427,7 @@ on: push
jobs:
call-secrets-analysis-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
```
to scan every push for secrets.

Expand All @@ -452,7 +453,7 @@ on:
jobs:
call-version-info-workflow:
uses: ASFHyP3/actions/.github/workflows/[email protected].1
uses: ASFHyP3/actions/.github/workflows/[email protected].2
with:
python_version: '3.12' # Optional; default shown
Expand Down

0 comments on commit b05df4d

Please sign in to comment.