Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# WARNING: Do not edit this file manually.
# Any changes will be overwritten by Copier.
_commit: v0.4.1-1-gd3a985d
_commit: v0.4.6
_src_path: gh:easyscience/templates
app_docs_url: https://easyscience.github.io/peasy-app
app_doi: 10.5281/zenodo.18163581
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,13 @@ on:
- skipped
- success
dry_run:
description: 'Only log actions, do not perform any delete operations.'
description: 'Only log actions, do not perform any delete operations (dry run).'
required: false
default: 'false'
type: choice
options:
- 'false'
- 'true'

jobs:
del-runs:
Expand Down
20 changes: 6 additions & 14 deletions .github/workflows/release-pr.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,14 @@
# This workflow creates an automated release PR from `develop` into `master`.
# This workflow creates an automated release PR from a source branch into the default branch.
#
# Usage:
# - Triggered manually via workflow_dispatch.
# - Creates a PR titled "Release: merge develop into master".
# - Adds the label "[maintainer] auto-pull-request" so it is excluded from changelogs.
# - Creates a PR titled "Release: merge <source> into <default>".
# - Adds the label "[bot] pull request" so it is excluded from changelogs.
# - The PR body makes clear that this is automation only (no review needed).
#
# Required repo config:
# https://github.com/organizations/easyscience/settings/secrets/actions
# https://github.com/organizations/easyscience/settings/variables/actions
# - Actions secret: EASYSCIENCE_APP_KEY (GitHub App private key PEM)
# - Actions variable: EASYSCIENCE_APP_ID (GitHub App ID)

name: Release PR (develop/feature -> master)
name: 'Release PR (<source> → <default>)'

on:
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
inputs:
source_branch:
Expand All @@ -28,7 +21,6 @@ permissions:
contents: read
pull-requests: write

# Set the environment variables to be used in all jobs defined in this workflow
env:
DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
SOURCE_BRANCH: ${{ inputs.source_branch || 'develop' }}
Expand All @@ -50,6 +42,8 @@ jobs:
private-key: ${{ secrets.EASYSCIENCE_APP_KEY }}

- name: Create PR from ${{ env.SOURCE_BRANCH }} to ${{ env.DEFAULT_BRANCH }}
env:
GH_TOKEN: ${{ steps.bot.outputs.token }}
run: |
gh pr create \
--base ${{ env.DEFAULT_BRANCH }} \
Expand All @@ -59,5 +53,3 @@ jobs:
--body "This PR is created automatically to trigger the release pipeline. It merges the accumulated changes from \`${{ env.SOURCE_BRANCH }}\` into \`${{ env.DEFAULT_BRANCH }}\`.

⚠️ It is labeled \`[bot] pull request\` and is excluded from release notes and version bump logic."
env:
GH_TOKEN: ${{ steps.bot.outputs.token }}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ against experimental data.

<!-- HOME REPOSITORY SECTION -->

**EasyPeasy** is available both as a Python library and as a
**EasyPeasy** is developed both as a Python library and as a
cross-platform desktop application.

Here, we focus on the Python library. For the graphical user interface
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/introduction/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ icon: material/information-slab-circle
calculations based on a theoretical model and refining its parameters
against experimental data.

**EasyPeasy** is available both as a Python library and as a
**EasyPeasy** is developed both as a Python library and as a
cross-platform desktop application.

Here, we focus on the Python library. For the graphical user interface
Expand Down
Loading
Loading