Skip to content

Commit 5167df1

Browse files
Friday Night Marigold updates
1 parent dbe32f9 commit 5167df1

49 files changed

Lines changed: 1955 additions & 7572 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build-windows.yml‎

Lines changed: 0 additions & 262 deletions
This file was deleted.

‎.github/workflows/release.yml‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ name: release
22

33
# Builds the self-contained Windows StreamFLOW.exe installer (jpackage) and publishes it as a
44
# GitHub Release asset. The installer bundles the JavaFX app, a private JRE, the engine scripts,
5-
# a portable Python (FlowKit) runtime, and the pre-staged R-Portable (FlowMagic plugins), so the
6-
# end user needs no Java, Python, or R installed.
5+
# and a portable Python (FlowKit) runtime, so the end user needs no Java or Python installed.
76
#
8-
# Triggers:
9-
# * push a tag like v2.0.0 -> release named after the tag
10-
# * manual "Run workflow" -> provide the version; a v<version> tag is created
7+
# Python-only by DEFAULT (smaller, faster). The R-plugin runway is preserved: set the "bundle_r"
8+
# input to true to ALSO bundle R-Portable + the R-based plugins (FlowMagic, PeacoQC). When bundle_r
9+
# is false the R download step is skipped and package.ps1 runs with -SkipR. Tag-triggered releases
10+
# are always Python-only; use "Run workflow" with bundle_r=true for an R-enabled build.
1111
#
12-
# R-Portable is NOT built here — it is downloaded from a GitHub Release asset produced by
13-
# the stage-r-portable workflow. Update R_PORTABLE_TAG below whenever a new R build is staged.
12+
# Triggers:
13+
# * push a tag like v2.0.0 -> Python-only release named after the tag
14+
# * manual "Run workflow" -> provide the version; optionally bundle_r=true for an R build
1415

1516
on:
1617
push:
@@ -22,13 +23,18 @@ on:
2223
description: 'App version to build and release (e.g. 2.0.1)'
2324
required: true
2425
default: '2.0.0'
26+
bundle_r:
27+
description: 'Also bundle R-Portable + R plugins (FlowMagic/PeacoQC)? Leave false for a Python-only build.'
28+
type: boolean
29+
required: false
30+
default: false
2531
r_portable_tag:
26-
description: 'R-Portable release tag to bundle (leave blank to use the default below)'
32+
description: 'R-Portable release tag to bundle (only used when bundle_r is true; blank = default below)'
2733
required: false
2834
default: ''
2935

3036
env:
31-
# Default R-Portable release tag — update this after running stage-r-portable
37+
# Default R-Portable release tag — used only when bundle_r=true. Update after running stage-r-portable.
3238
R_PORTABLE_TAG: r-portable-2026-07-04
3339

3440
permissions:
@@ -75,6 +81,7 @@ jobs:
7581
run: powershell -ExecutionPolicy Bypass -File engine\stage-python.ps1
7682

7783
- name: Download R-Portable from release assets
84+
if: ${{ github.event.inputs.bundle_r == 'true' }}
7885
shell: pwsh
7986
run: |
8087
# Prefer the workflow-dispatch override, then fall back to the env default.

0 commit comments

Comments
 (0)