Release: merge develop into master

.copier-answers.yml

@@ -1,12 +1,14 @@
 # WARNING: Do not edit this file manually.
 # Any changes will be overwritten by Copier.
-_commit: v0.0.5
+_commit: v0.10.0
 _src_path: gh:easyscience/templates
 app_docs_url: https://easyscience.github.io/dynamics-app
 app_doi: 10.5281/zenodo.18163581
 app_package_name: easydynamics_app
 app_python: '3.12'
 app_repo_name: dynamics-app
+home_page_url: https://easyscience.github.io/dynamics
+home_repo_name: dynamics
 lib_docs_url: https://easyscience.github.io/dynamics-lib
 lib_doi: 10.5281/zenodo.18163581
 lib_package_name: easydynamics
@@ -15,10 +17,9 @@ lib_python_min: '3.11'
 lib_repo_name: dynamics-lib
 project_contact_email: henrik.jacobsen@ess.eu
 project_copyright_years: 2025-2026
-project_extended_description: For plotting and fitting QENS and INS powder data
-project_homepage_url: https://easyscience.github.io/dynamics
+project_extended_description: A software for plotting and fitting QENS and INS powder
+    data
 project_name: EasyDynamics
-project_repo_name: dynamics
 project_short_description: QENS data analysis
 project_shortcut: EQ
 project_type: both

.github/actions/setup-pixi/action.yml

@@ -33,7 +33,7 @@ inputs:
 runs:
   using: 'composite'
   steps:
-    - uses: prefix-dev/setup-pixi@v0.9.3
+    - uses: prefix-dev/setup-pixi@v0.9.4
       with:
         environments: ${{ inputs.environments }}
         activate-environment: ${{ inputs.activate-environment }}

.github/configs/pages-deployment.json

@@ -0,0 +1,6 @@
+{
+  "source": {
+    "branch": "gh-pages",
+    "path": "/"
+  }
+}

.github/configs/rulesets-develop.json

@@ -0,0 +1,37 @@
+{
+  "name": "develop branch",
+  "target": "branch",
+  "enforcement": "active",
+  "conditions": {
+    "ref_name": {
+      "include": ["refs/heads/develop"],
+      "exclude": []
+    }
+  },
+  "bypass_actors": [
+    {
+      "actor_id": 2476259,
+      "actor_type": "Integration",
+      "bypass_mode": "always"
+    }
+  ],
+  "rules": [
+    {
+      "type": "non_fast_forward"
+    },
+    {
+      "type": "deletion"
+    },
+    {
+      "type": "pull_request",
+      "parameters": {
+        "allowed_merge_methods": ["squash"],
+        "dismiss_stale_reviews_on_push": false,
+        "require_code_owner_review": false,
+        "require_last_push_approval": false,
+        "required_approving_review_count": 0,
+        "required_review_thread_resolution": false
+      }
+    }
+  ]
+}

.github/configs/rulesets-gh-pages.json

@@ -0,0 +1,19 @@
+{
+  "name": "gh-pages branch",
+  "target": "branch",
+  "enforcement": "active",
+  "conditions": {
+    "ref_name": {
+      "include": ["refs/heads/gh-pages"],
+      "exclude": []
+    }
+  },
+  "rules": [
+    {
+      "type": "non_fast_forward"
+    },
+    {
+      "type": "deletion"
+    }
+  ]
+}

.github/configs/rulesets-master.json

@@ -0,0 +1,30 @@
+{
+  "name": "master branch",
+  "target": "branch",
+  "enforcement": "active",
+  "conditions": {
+    "ref_name": {
+      "include": ["~DEFAULT_BRANCH"],
+      "exclude": []
+    }
+  },
+  "rules": [
+    {
+      "type": "non_fast_forward"
+    },
+    {
+      "type": "deletion"
+    },
+    {
+      "type": "pull_request",
+      "parameters": {
+        "allowed_merge_methods": ["merge"],
+        "dismiss_stale_reviews_on_push": false,
+        "require_code_owner_review": false,
+        "require_last_push_approval": false,
+        "required_approving_review_count": 0,
+        "required_review_thread_resolution": false
+      }
+    }
+  ]
+}

.github/scripts/backmerge-conflict-issue.js

@@ -0,0 +1,69 @@
+module.exports = async ({ github, context, core }) => {
+  // Repo context
+  const owner = context.repo.owner
+  const repo = context.repo.repo
+
+  // Link to the exact workflow run that detected the conflict
+  const runUrl = `${context.serverUrl}/${owner}/${repo}/actions/runs/${context.runId}`
+
+  // We use a *stable title* so we can find/reuse the same "conflict tracker" issue
+  // instead of creating a new issue on every failed run.
+  const title = 'Backmerge conflict: master → develop'
+
+  // Comment/issue body includes the run URL so maintainers can jump straight to logs.
+  const body = [
+    'Automatic backmerge failed due to merge conflicts.',
+    '',
+    `Workflow run: ${runUrl}`,
+    '',
+    'Manual resolution required.',
+  ].join('\n')
+
+  // Label applied to the tracker issue (assumed to already exist in the repo).
+  const label = '[bot] backmerge'
+
+  // Search issues by title across *open and closed* issues.
+  // Why: if the conflict was resolved previously and the issue was closed,
+  // we prefer to reopen it and append a new comment instead of creating duplicates.
+  const q = `repo:${owner}/${repo} is:issue in:title "${title}"`
+  const search = await github.rest.search.issuesAndPullRequests({
+    q,
+    per_page: 10,
+  })
+
+  // Pick the first exact-title match (search can return partial matches).
+  const existing = search.data.items.find((i) => i.title === title)
+
+  if (existing) {
+    // If a tracker issue exists, reuse it:
+    // - reopen it if needed
+    // - add a comment with the new run URL
+    if (existing.state === 'closed') {
+      await github.rest.issues.update({
+        owner,
+        repo,
+        issue_number: existing.number,
+        state: 'open',
+      })
+    }
+
+    await github.rest.issues.createComment({
+      owner,
+      repo,
+      issue_number: existing.number,
+      body,
+    })
+
+    core.notice(`Conflict issue updated: #${existing.number}`)
+    return
+  }
+
+  // No tracker issue exists yet -> create the first one.
+  await github.rest.issues.create({
+    owner,
+    repo,
+    title,
+    body,
+    labels: [label],
+  })
+}

.github/workflows/backmerge.yml

@@ -1,34 +1,29 @@
 # This workflow automatically merges `master` into `develop` whenever a
-# new version tag is pushed (v*).
-#
-# Key points:
-# - Directly merges master into develop without creating a PR.
-# - Skips CI on the merge commit using [skip ci] in the commit message.
-# - The code being merged has already been tested as part of the release process.
-# - This ensures develop stays up-to-date with release changes (version bumps, etc.).
-#
-# Required organization 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)
-#
-# IMPORTANT:
-# The GitHub App must be added to the develop branch ruleset bypass list.
-
-name: Backmerge (master -> develop)
+# new version release with a tag is published. It can also be triggered
+# manually via workflow_dispatch for cases where an automatic backmerge
+# is needed outside of the standard release process.
+# If a merge conflict occurs, the workflow creates an issue to notify
+# maintainers for manual resolution.
+
+name: Backmerge (master → develop)
 
 on:
-  push:
-    tags: ['v*']
+  release:
+    types: [published, prereleased]
   workflow_dispatch:
 
 permissions:
   contents: write
+  issues: write
+
+concurrency:
+  group: backmerge-master-into-develop
+  cancel-in-progress: false
 
 jobs:
   backmerge:
     runs-on: ubuntu-latest
+    timeout-minutes: 10
 
     steps:
       - name: Checkout repository (for local actions)
@@ -53,34 +48,62 @@ jobs:
           git config user.name "easyscience[bot]"
           git config user.email "${{ vars.EASYSCIENCE_APP_ID }}+easyscience[bot]@users.noreply.github.com"
 
-      - name: Merge master into develop
+      - name: Set merge message
         run: |
-          set -euo pipefail
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+            MESSAGE="Backmerge: master into develop (manual) [skip ci]"
+          else
+            TAG="${{ github.event.release.tag_name }}"
+            MESSAGE="Backmerge: master (${TAG}) into develop [skip ci]"
+          fi
 
-          echo "Fetching develop branch"
-          git fetch origin develop:develop
+          echo "MESSAGE=$MESSAGE" >> "$GITHUB_ENV"
+          echo "message=$MESSAGE" >> "$GITHUB_OUTPUT"
+          echo "📝 Merge message: $MESSAGE" | tee -a "$GITHUB_STEP_SUMMARY"
 
-          echo "Switching to develop branch"
-          git checkout develop
+      - name: Prepare branches
+        run: |
+          git fetch origin master develop
+          git checkout -B develop origin/develop
 
-          echo "Checking if already up-to-date"
+      - name: Check if develop is already up-to-date
+        id: up_to_date
+        run: |
           if git merge-base --is-ancestor origin/master develop; then
-            echo "ℹ️ Develop is already up-to-date with master"
-            exit 0
+            echo "value=true" >> "$GITHUB_OUTPUT"
+            echo "ℹ️ Develop is already up-to-date with master" | tee -a "$GITHUB_STEP_SUMMARY"
+          else
+            echo "value=false" >> "$GITHUB_OUTPUT"
           fi
 
-          echo "Preparing merge message"
-          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-            MESSAGE="Backmerge: master into develop (manual) [skip ci]"
-          else
-            TAG="${{ github.ref_name }}"
-            MESSAGE="Backmerge: ${TAG} from master into develop [skip ci]"
+      - name: Try merge master into develop
+        id: merge
+        if: steps.up_to_date.outputs.value == 'false'
+        continue-on-error: true
+        run: |
+          if ! git merge origin/master --no-ff -m "${MESSAGE}"; then
+            echo "conflict=true" >> "$GITHUB_OUTPUT"
+            echo "❌ Backmerge conflict detected." | tee -a "$GITHUB_STEP_SUMMARY"
+            git status --porcelain || true
+            exit 0
           fi
 
-          echo "Merging master into develop"
-          git merge origin/master --no-ff -m "${MESSAGE}"
+          echo "conflict=false" >> "$GITHUB_OUTPUT"
+          echo "✅ Merge commit created." | tee -a "$GITHUB_STEP_SUMMARY"
 
-          echo "Pushing to develop"
+      - name: Push to develop (if merge succeeded)
+        if:
+          steps.up_to_date.outputs.value == 'false' && steps.merge.outputs.conflict ==
+          'false'
+        run: |
           git push origin develop
+          echo "🚀 Backmerge successful: master → develop" | tee -a "$GITHUB_STEP_SUMMARY"
 
-          echo "✅ Successfully merged master into develop"
+      - name: Create issue (if merge failed with conflicts)
+        if: steps.merge.outputs.conflict == 'true'
+        uses: ./.github/actions/github-script
+        with:
+          github-token: ${{ steps.bot.outputs.token }}
+          script: |
+            const run = require('./.github/scripts/backmerge-conflict-issue.js')
+            await run({ github, context, core })

.github/workflows/cleanup.yml

@@ -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:

.github/workflows/dashboard.yml

@@ -4,6 +4,9 @@ on:
   workflow_dispatch:
   workflow_call:
 
+permissions:
+  contents: read
+
 # Set the environment variables to be used in all jobs defined in this workflow
 env:
   CI_BRANCH: ${{ github.head_ref || github.ref_name }}