Skip to content
This repository has been archived by the owner on Nov 23, 2023. It is now read-only.

Blix v1.3.0 #224

Merged
merged 265 commits into from
Sep 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
265 commits
Select commit Hold shift + click to select a range
32bcea3
Merge pull request #160 from COS301-SE-2023/feature/Refresh-plugins-fix
Rec1dite Sep 7, 2023
1f96502
Merge branch 'dev' into feature/webviews
Rec1dite Sep 7, 2023
f1c617e
Add checks for node click and release
SharkmanZA Sep 7, 2023
42b81bf
Improve system prompt and add promp history in palette
ArmandKrynauw Sep 7, 2023
48250f8
Merge pull request #159 from COS301-SE-2023/feature/Keybindings-fix
ArmandKrynauw Sep 7, 2023
a2f0fe7
Add webview API sender function to Blink; Add TweakDial component for…
Rec1dite Sep 7, 2023
a4b4f5f
Improve some of the AI prompt handling
ArmandKrynauw Sep 7, 2023
8e84105
Add some more filters to Blink
Rec1dite Sep 7, 2023
8707a9d
Merge branch 'feature/webviews' into dev
Rec1dite Sep 7, 2023
639cb7a
Add tweak API
Rec1dite Sep 7, 2023
ad13905
Add DiffDial; Add dragging to NumberInput
Rec1dite Sep 7, 2023
efe161b
Fix styling on undo/redo buttons
ArmandKrynauw Sep 8, 2023
3cb51e8
Add PaLM again
ArmandKrynauw Sep 8, 2023
5c50383
Add blink and sharp plugin again
ArmandKrynauw Sep 8, 2023
a0702d9
Merge branch 'dev' into fix/ai-parser-bug
ArmandKrynauw Sep 8, 2023
a1929c4
Add TweakDial UIComponent to Blypescript Toolbox
ArmandKrynauw Sep 8, 2023
ec3b1f6
Merge pull request #165 from COS301-SE-2023/fix/ai-parser-bug
ArmandKrynauw Sep 8, 2023
e2e2d57
Fixed blank recent project
CenturionLC Sep 8, 2023
c1dd6f4
Many bug fixes
SharkmanZA Sep 8, 2023
61ecedc
Merge branch 'dev' into feature/projects
SharkmanZA Sep 8, 2023
1666446
Add DiffDial skeleton; Fix media output not fetching initial content …
Rec1dite Sep 8, 2023
d59689c
Hook up AI to undo/redo system
ArmandKrynauw Sep 8, 2023
bafdee7
Fix node removal undo/redo event
SharkmanZA Sep 8, 2023
4994077
Add limit to undo/redo events per graph
SharkmanZA Sep 8, 2023
3fc46b4
Merge feature/cameraTile into feature/webviews
Klairgo Sep 8, 2023
b63c632
Add CachePicker to blink
Klairgo Sep 8, 2023
d4f0bc2
Add fix to reset selection box when list is empty
ArmandKrynauw Sep 8, 2023
c56c0b0
Fix active graph ID for AI
ArmandKrynauw Sep 8, 2023
85c2332
Fix Ai undo/redo events and gravity node position saving
SharkmanZA Sep 8, 2023
fb0183f
Merge pull request #169 from COS301-SE-2023/fix/active-graph-id
ArmandKrynauw Sep 8, 2023
ea474b0
Merge pull request #161 from COS301-SE-2023/feature/projects
ArmandKrynauw Sep 8, 2023
6bb3bc6
Merge branch 'dev' into feature/Project-blank-fix
SharkmanZA Sep 8, 2023
759975e
Merge pull request #167 from COS301-SE-2023/feature/Project-blank-fix
SharkmanZA Sep 8, 2023
4132ce4
Update glfx and pixi to work with camera
Klairgo Sep 8, 2023
9db968e
Fix linux build
CenturionLC Sep 8, 2023
41045f5
Add checks to parser to validate numeric UI inputs
ArmandKrynauw Sep 8, 2023
90201af
Remove sharp plugin and save AI chats
ArmandKrynauw Sep 8, 2023
9b5b87d
Add some extra extra safety for chat write to disk
ArmandKrynauw Sep 8, 2023
0b3cbc3
Add some temp fixes for media output selection
ArmandKrynauw Sep 8, 2023
add730b
Merge pull request #172 from COS301-SE-2023/fix/media-output-selection
ArmandKrynauw Sep 8, 2023
e79e14b
Add option to change model type
ArmandKrynauw Sep 8, 2023
ca622ee
Restructure Blink bounding box so it's scale-invariant; Adjust Blink …
Rec1dite Sep 11, 2023
91ae83b
Merge branch 'feature/webviews' of https://github.com/COS301-SE-2023/…
Rec1dite Sep 11, 2023
049899c
Add edit nodes to blink
Klairgo Sep 12, 2023
5cfadf6
Add new ColorPicker
Rec1dite Sep 13, 2023
e6ee70d
Merge branch 'feature/webviews' of https://github.com/COS301-SE-2023/…
Rec1dite Sep 13, 2023
b5fb82f
Add Blink diffing system; Working 1 layer deep
Rec1dite Sep 15, 2023
440f84d
Merge branch 'COS301-SE-2023:dev' into dev
ArmandKrynauw Sep 18, 2023
3d4e4cf
Try something
ArmandKrynauw Sep 18, 2023
59da2b4
Oops, made a mistake last commit
ArmandKrynauw Sep 18, 2023
ffafba0
Try again
ArmandKrynauw Sep 18, 2023
408f525
Add extra step
ArmandKrynauw Sep 18, 2023
f9457c5
Fix package.json
ArmandKrynauw Sep 18, 2023
1ad093d
Add set env step
ArmandKrynauw Sep 18, 2023
777c267
Make some changes
ArmandKrynauw Sep 18, 2023
e0e5083
Update version
ArmandKrynauw Sep 18, 2023
bf0ff10
Fix Blink nested children destroyed on graph transform update
Rec1dite Sep 18, 2023
a627aed
Fix
ArmandKrynauw Sep 18, 2023
58a31a9
Update version
ArmandKrynauw Sep 18, 2023
37ba60c
Fix Blink filter bounds broken with dynamic viewport on re-render
Rec1dite Sep 18, 2023
42594df
Update workflow
ArmandKrynauw Sep 18, 2023
b5583c6
Fix Blink shapes and add color pickers for fill/stroke
Rec1dite Sep 18, 2023
1bcb6e2
Add inputText node to Blink
Rec1dite Sep 18, 2023
f3c076a
Add asset upload
Klairgo Sep 18, 2023
b67bc9a
Attempt to fix jest type complaints
ArmandKrynauw Sep 19, 2023
fb908ad
Add check for updates command
ArmandKrynauw Sep 19, 2023
fbad78d
Add some auto update fixes
ArmandKrynauw Sep 19, 2023
5583292
Update workflow
ArmandKrynauw Sep 19, 2023
c15e5c6
Update workflow
ArmandKrynauw Sep 19, 2023
21ae588
Update workflow
ArmandKrynauw Sep 19, 2023
0e4cf5a
Update version
ArmandKrynauw Sep 19, 2023
b06ca9b
Update workflow
ArmandKrynauw Sep 19, 2023
9b774c5
Update workflow
ArmandKrynauw Sep 19, 2023
fbf3dd2
Fix FilePicker loses state on tile split; Add neater debug output for…
Rec1dite Sep 19, 2023
c168758
Update workflow
ArmandKrynauw Sep 19, 2023
2c4f63b
Update check for updates message
ArmandKrynauw Sep 19, 2023
22127f2
Replace plugin signature in node.instantiate() with ContextMenu folde…
Rec1dite Sep 20, 2023
febc8b8
Refactor settings and keybindings
ArmandKrynauw Sep 20, 2023
fb79997
Add some extra key replacements for keybinds
ArmandKrynauw Sep 20, 2023
05986ed
Add scrollbar on vertical overflow to hotkeys page
ArmandKrynauw Sep 20, 2023
81e871e
Fix retrieving user settings
ArmandKrynauw Sep 20, 2023
e2a333d
Remove old settings page code
ArmandKrynauw Sep 20, 2023
024c0c1
Remove old get settings from UtilApi
ArmandKrynauw Sep 20, 2023
7f09676
Add chip to show when adding hotkey
ArmandKrynauw Sep 20, 2023
97cdd4c
Merge pull request #181 from COS301-SE-2023/refactor/settings-page
ArmandKrynauw Sep 20, 2023
4bc6854
Merge branch 'COS301-SE-2023:dev' into dev
ArmandKrynauw Sep 20, 2023
31afbad
Implement undo/redo system to work with text inputs
SharkmanZA Sep 20, 2023
b6c83ff
Fix everything with media outputs
ArmandKrynauw Sep 20, 2023
c8ff6a4
Merge branch 'dev' into feature/projects
ArmandKrynauw Sep 20, 2023
43362e1
Add initial About settings page content
ArmandKrynauw Sep 20, 2023
9ce05cb
Add cache metadata and image thumbnails to Assets tile
Rec1dite Sep 21, 2023
e877d4b
Split settings into components
ArmandKrynauw Sep 21, 2023
2aef87a
Add some auto update stuff
ArmandKrynauw Sep 21, 2023
1e58755
New version test
ArmandKrynauw Sep 21, 2023
3d62064
Fix media tile loading after using AI
SharkmanZA Sep 21, 2023
c63ddad
Fix
ArmandKrynauw Sep 21, 2023
b834bc6
Fix socket mocks
CenturionLC Sep 21, 2023
f7026cc
Refactored settings item to enable multiple components
ArmandKrynauw Sep 21, 2023
16f2cda
Add example export to blink
Klairgo Sep 21, 2023
d8fb4da
Merge pull request #182 from COS301-SE-2023/feature/projects
ArmandKrynauw Sep 21, 2023
c53c791
All neccesary mocks added
CenturionLC Sep 21, 2023
04be1e8
Add some extra auto update logic
ArmandKrynauw Sep 21, 2023
121f9a3
Add check for updates from command palette
ArmandKrynauw Sep 21, 2023
ccdfc92
Fix layout switching bug when changing projects
SharkmanZA Sep 21, 2023
f926d2a
Fix GLFX plugin and anchors
Klairgo Sep 21, 2023
724e3bc
Add some extra logic to show download progress
ArmandKrynauw Sep 21, 2023
470bc4d
Merge branch 'dev' into fix/glfx
SharkmanZA Sep 21, 2023
3bf3043
Merge pull request #185 from COS301-SE-2023/fix/glfx
Klairgo Sep 21, 2023
70f372f
Fix missing props on Blix update
ArmandKrynauw Sep 21, 2023
92f286f
Fix help link
ArmandKrynauw Sep 21, 2023
db87eb7
Fix interpreter bug
Klairgo Sep 21, 2023
8fd48aa
Fix spellling
ArmandKrynauw Sep 21, 2023
149f958
All tests fixed, AGAIN.
CenturionLC Sep 21, 2023
6306cfc
Try to fix some stuff
ArmandKrynauw Sep 21, 2023
a804cc0
Merge pull request #186 from COS301-SE-2023/fix/jest-types
ArmandKrynauw Sep 21, 2023
e576518
Clean up UI for button
ArmandKrynauw Sep 21, 2023
7d630aa
Add word to comment
ArmandKrynauw Sep 21, 2023
7313e4c
Merge pull request #188 from COS301-SE-2023/fix/interpreter
Klairgo Sep 21, 2023
044000c
Another fix attempt
ArmandKrynauw Sep 21, 2023
43de05d
Sus
ArmandKrynauw Sep 21, 2023
332d01c
Add extra check for equivalence of media outputId sets
SharkmanZA Sep 21, 2023
e3ecfed
Remove some sus stuff
ArmandKrynauw Sep 21, 2023
48ce289
Disable download button when downloading
ArmandKrynauw Sep 21, 2023
d5cff04
Merge pull request #191 from COS301-SE-2023:fix/missing-outputId-in-s…
ArmandKrynauw Sep 21, 2023
238dd7e
Add swirl and zoomBlur to glfx plugin
Klairgo Sep 21, 2023
ebd1ed2
Change back old package.json configs
ArmandKrynauw Sep 21, 2023
d71d28c
Merge pull request #192 from ArmandKrynauw/fix/auto-updates
ArmandKrynauw Sep 21, 2023
5d3e5f8
Add Tile Shift and Bulge / Pinch to glfx
Klairgo Sep 21, 2023
d96419d
Add Ink, Edge Works and Hexagonal Pixelate to glfx
Klairgo Sep 21, 2023
ce9f6ff
Restyle Assets tile; Fix cache system race condition when fetching mu…
Rec1dite Sep 21, 2023
084212b
Merge branch 'dev' into fix/layouts
ArmandKrynauw Sep 21, 2023
062e33a
Remove token
ArmandKrynauw Sep 21, 2023
febb8e3
Merge pull request #184 from COS301-SE-2023/fix/layouts
ArmandKrynauw Sep 21, 2023
94c57e9
Merge pull request #193 from COS301-SE-2023/add/glfxNodes
ArmandKrynauw Sep 21, 2023
62dd335
Disable webview dev buttons
ArmandKrynauw Sep 21, 2023
d2d378d
Fix cache system race condition for write() and in webview preload
Rec1dite Sep 21, 2023
947a1a0
Skeleton PluginBrowser UI + add markdown rendering
Rec1dite Sep 21, 2023
9dedd2b
Merge branch 'feature/webviews' of https://github.com/COS301-SE-2023/…
Rec1dite Sep 21, 2023
d87beaa
Add PluginApi; Add install/enable buttons to PluginBrowser
Rec1dite Sep 22, 2023
1a052c8
Minor PanelNode coverage fix
CenturionLC Sep 22, 2023
1702b65
Restyle 'no content' message in media tile
Rec1dite Sep 22, 2023
ce6b68d
Add more panelNode tests
CenturionLC Sep 22, 2023
0e7504d
Merge branch 'feature/cache' into feature/webviews
Rec1dite Sep 22, 2023
c0bc31a
Add Blink exportImage() to cache system
Rec1dite Sep 22, 2023
1cda9f7
Fix Blink cache image export function typo
Rec1dite Sep 22, 2023
e557a2b
Migrate Blink inputImage to cache system; Fix incorrect bounding rect…
Rec1dite Sep 23, 2023
709fa32
Fix window control buttons on Windows
ArmandKrynauw Sep 23, 2023
5f92651
PanelNode tests finished
CenturionLC Sep 23, 2023
80e5875
Add project.ts tests and docs
CenturionLC Sep 23, 2023
3bec62f
Merge branch 'dev' into feature/webviews
ArmandKrynauw Sep 23, 2023
64a9455
Refactor CoreGraph node adding
SharkmanZA Sep 23, 2023
ded4347
Fix tests
ArmandKrynauw Sep 23, 2023
1ff4bfc
Merge pull request #196 from COS301-SE-2023/feature/webviews
ArmandKrynauw Sep 23, 2023
1412610
Initiated TileBuilder testing
CenturionLC Sep 23, 2023
8eb16fa
Add emboss, bulge and zoomblur filters to blink
Klairgo Sep 24, 2023
ccb1627
TileBuilder tests improved
CenturionLC Sep 24, 2023
6715af8
Merge branch 'dev' into fix/coverage
CenturionLC Sep 24, 2023
6860d88
Add frontend implementation of export system
Klairgo Sep 24, 2023
21f4441
Improve robustness of Blypescript Toolbox and Plugins
ArmandKrynauw Sep 25, 2023
a459837
Add export functionality to media tile
Klairgo Sep 25, 2023
4557c0d
Add rudimentary clump masking to Blink
Rec1dite Sep 25, 2023
054f6b1
Add curve atom rendering to blink
Rec1dite Sep 25, 2023
2c245dc
Add export to cache and glfx plugin
Klairgo Sep 25, 2023
e447632
Add export to glfx and update input node to work with cache
Klairgo Sep 25, 2023
3177a7a
Settings.ts tests added
CenturionLC Sep 25, 2023
d7258ae
Implement undo/redo system to work with more ui components
SharkmanZA Sep 25, 2023
7222aa4
Cleanup cache picker
SharkmanZA Sep 25, 2023
25cf592
Settings.ts fully tested
CenturionLC Sep 25, 2023
bb55c3e
Merge pull request #204 from COS301-SE-2023/refactor/blink-uicomponents
Rec1dite Sep 25, 2023
4430ed9
Initial TypeClassRegistry tests
CenturionLC Sep 25, 2023
a4299b9
Clean up exporting of assets
ArmandKrynauw Sep 25, 2023
a6a19d6
Temp fix image assets not initially loading when filtered
Rec1dite Sep 25, 2023
5df492c
Add delete to asset tile
Klairgo Sep 25, 2023
2c97184
Clean up deleting of assets
ArmandKrynauw Sep 25, 2023
99f31ff
Fix glfx load bug
Klairgo Sep 25, 2023
64b63d2
Merge pull request #202 from COS301-SE-2023/fix/blypescript-toolbox
ArmandKrynauw Sep 25, 2023
ec04c8b
Fix some UI button widths
ArmandKrynauw Sep 25, 2023
1071076
Merge branch 'dev' into feature/export
ArmandKrynauw Sep 25, 2023
a3cb5ff
Fix test
ArmandKrynauw Sep 25, 2023
43ba62c
Merge pull request #203 from COS301-SE-2023/feature/export
ArmandKrynauw Sep 25, 2023
35f1668
Fix Blink deletion of child clump not updating scene
Rec1dite Sep 25, 2023
69498e2
Add canvas configuration to Blink
Rec1dite Sep 25, 2023
fb86873
TypeclassRegistry tests done
CenturionLC Sep 26, 2023
21fc459
Fix Camera Tile
Klairgo Sep 26, 2023
62c1c7c
Initial TypeClassBuilder tests
CenturionLC Sep 26, 2023
fa659f3
TypeClassBuilder finished
CenturionLC Sep 26, 2023
6f2afdb
Clean up camera UI
ArmandKrynauw Sep 26, 2023
e7c30e5
Merge pull request #211 from COS301-SE-2023/feature/webcamera
ArmandKrynauw Sep 26, 2023
2437ae0
Merge branch 'dev' into feature/blinkNodes
Klairgo Sep 26, 2023
1c52e13
Add blink nodes
Klairgo Sep 26, 2023
f831756
Add label to ColorPicker, specialize filter padding
Rec1dite Sep 26, 2023
b85355e
Urgent AiManger toolbox bug fix
ArmandKrynauw Sep 26, 2023
9c8e611
Add initial plugin build script
ArmandKrynauw Sep 26, 2023
d514a7a
Add plugins build shell script
ArmandKrynauw Sep 26, 2023
8fee2db
Fix script variable instantiation
ArmandKrynauw Sep 26, 2023
e704314
Change back to JS build script
ArmandKrynauw Sep 26, 2023
9a4bac5
Fix plugin build script
ArmandKrynauw Sep 26, 2023
c0391d6
Fix paths and add build timeout
ArmandKrynauw Sep 26, 2023
d153845
Fix spelling mistakes
Klairgo Sep 26, 2023
944ad7d
Merge pull request #212 from COS301-SE-2023/feature/blinkNodes
ArmandKrynauw Sep 26, 2023
a37244f
Add CoreGraph manager tests
SharkmanZA Sep 26, 2023
3dff9cf
Bump Blix to v1.2.0
ArmandKrynauw Sep 27, 2023
4f0317c
Merge pull request #213 from COS301-SE-2023/feature/plugin-build-script
ArmandKrynauw Sep 27, 2023
2311f91
pluginCommand tests done
CenturionLC Sep 27, 2023
57972df
small fix
CenturionLC Sep 27, 2023
ddddfe3
Merge pull request #214 from COS301-SE-2023/fix/core-graph-event-mana…
SharkmanZA Sep 27, 2023
8085241
Merge branch 'dev' into fix/coverage
CenturionLC Sep 27, 2023
c9c3453
Merge branch 'dev' into fix/coverage
CenturionLC Sep 27, 2023
49eb2bc
update package.json
CenturionLC Sep 27, 2023
c84c027
Fix e2e test
Klairgo Sep 27, 2023
eca4d02
Merge pull request #216 from COS301-SE-2023/fix/coverage
CenturionLC Sep 27, 2023
cfc4b60
Rewrite media output id logic
ArmandKrynauw Sep 27, 2023
d9fdb29
Fix test
ArmandKrynauw Sep 27, 2023
cc20420
General UI improvements
ArmandKrynauw Sep 27, 2023
0aaa420
Clean up some UI
ArmandKrynauw Sep 27, 2023
c0baccd
Fix playwright bug
Klairgo Sep 27, 2023
95da8ed
Fix GLFX canvas overflow & add large image resolution clamping
Rec1dite Sep 27, 2023
72b434b
Merge pull request #217 from COS301-SE-2023/fix/media-output-id
ArmandKrynauw Sep 27, 2023
87c8d84
Fix graph event manager tests:
SharkmanZA Sep 27, 2023
5eb776e
Clean up last min v1.2.0 fixes
ArmandKrynauw Sep 27, 2023
d567cb0
Fix extra edges occasionally deleted (finally 🤩)
Rec1dite Sep 27, 2023
d2a730e
Merge pull request #218 from COS301-SE-2023/fix/edgeDeletion
ArmandKrynauw Sep 27, 2023
54726dd
Add Checkbox and MatrixInput node UI inputs
Rec1dite Sep 27, 2023
5d10f41
Add OriginPicker node UI input
Rec1dite Sep 27, 2023
4e8522a
Implement default removal of project assets
SharkmanZA Sep 27, 2023
e80eb08
Clear media on removal of project
SharkmanZA Sep 27, 2023
7c40861
Ensure all frontend stores are clear
SharkmanZA Sep 27, 2023
3bebb43
Merge pull request #219 from COS301-SE-2023/fix/coverage
ArmandKrynauw Sep 27, 2023
3ba23e3
Add Blink origin point data + markers
Rec1dite Sep 27, 2023
c2dcdba
Change build workflow
ArmandKrynauw Sep 27, 2023
34f5985
Style PluginBrowser
Rec1dite Sep 27, 2023
5a8de2d
Merge branch 'dev' into feature/webviews
Rec1dite Sep 27, 2023
9ffa5a8
Update save and import project functionality
Klairgo Sep 27, 2023
2a4b37e
Merge pull request #220 from COS301-SE-2023/feature/webviews
ArmandKrynauw Sep 27, 2023
582fc43
Fix some tests
ArmandKrynauw Sep 27, 2023
79009bb
Remove console log in Jest
ArmandKrynauw Sep 27, 2023
ca98ded
Merge pull request #221 from COS301-SE-2023/fix/ai-lang-test
ArmandKrynauw Sep 27, 2023
86384d2
Add delete graph command back
SharkmanZA Sep 27, 2023
e1eac17
Fix graph id selected
ArmandKrynauw Sep 27, 2023
64b2b11
Add Blink repeat node, disable problematic edge-based directional gra…
Rec1dite Sep 27, 2023
c9e1bbd
Remove useless test
ArmandKrynauw Sep 27, 2023
9e0a016
Merge branch 'dev' into refactor/projects
ArmandKrynauw Sep 27, 2023
3d99c20
Adding verbose for Jest
ArmandKrynauw Sep 27, 2023
b93a87c
Try another fix
ArmandKrynauw Sep 27, 2023
dd988be
Graph node fix
ArmandKrynauw Sep 27, 2023
ace8599
Merge pull request #222 from COS301-SE-2023/refactor/projects
ArmandKrynauw Sep 27, 2023
69cbcc0
Increase Blink clump max elements; Add toggleable debug in Blink
Rec1dite Sep 28, 2023
280c027
Merge branch 'dev' into feature/webviews
Rec1dite Sep 28, 2023
582ac7c
Merge pull request #223 from COS301-SE-2023/feature/webviews
ArmandKrynauw Sep 28, 2023
6100742
Demo 4
ArmandKrynauw Sep 28, 2023
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
69 changes: 32 additions & 37 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,59 +1,54 @@
name: Build Codebase
name: Build/release

on:
push:
branches: [ master, dev ]
pull_request:
branches: [ master, dev ]
types: [opened, synchronize, reopened, ready_for_review]
permissions:
contents: read
branches:
- dev
- master

jobs:
start:
name: Start State 🚀🚀🚀
runs-on: ubuntu-latest
steps:
- name: Starting
id: init
run: |
echo "Starting building of ${{ github.repository }}"

build_project:
name: Build on all platforms
Build:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
needs: start
os: [ubuntu-latest, windows-latest, macos-latest]

steps:
- name: Checkout for ${{ runner.os }}
- name: Check out Git repository
uses: actions/checkout@v3
- name: Set up Node 18

- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18

- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.npm
key: npm-${{ hashFiles('package-lock.json') }}
restore-keys: npm-

- name: Install dependencies
run: npm ci
- name: Run tests and collect coverage
run: npm run test
- name: Build Project for ${{ runner.os }}
run: npm run build

end:
name: End State ✅✅✅
runs-on: ubuntu-latest
needs: build_project
steps:
- name: Ending
id: init
run: |
echo "Ending building of ${{ github.repository }}"

- name: Build Blix Plugins
run: node ./scripts/plugins.js

- name: Build/Release Blix
run: |
if [ "${{ matrix.os }}" = "ubuntu-latest" ]; then
npm run dist -- --linux deb AppImage --x64 --arm64
# npm run dist -- --linux deb --x64 --arm64
elif [ "${{ matrix.os }}" = "windows-latest" ]; then
npm run dist -- --windows nsis
elif [ "${{ matrix.os }}" = "macos-latest" ]; then
# npm run dist -- --mac dmg --x64 --arm64
npm run dist -- --mac dmg --arm64
fi
env:
GH_TOKEN: ${{ secrets.TEST_TOKEN }}
shell: bash

timeout-minutes: 30
10 changes: 9 additions & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macOS-latest]
os: [ubuntu-latest, macos-latest]
needs: start
steps:
- name: Checkout for ${{ runner.os }}
uses: actions/checkout@v3

- name: Set up Node 18
uses: actions/setup-node@v3
with:
Expand All @@ -43,14 +44,21 @@ jobs:

- name: Install dependencies
run: npm ci

- name: Run unit/integration tests and collect coverage
run: npm run test
env:
CI: true

- name: Upload coverage to Codecov
if: ${{ runner.os == 'macOS' }}
uses: codecov/codecov-action@v3
with:
files: coverage/lcov.info
token: ${{ secrets.CODECOV_TOKEN }}

timeout-minutes: 20

end:
name: End State ✅✅✅
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion __mocks__/hello-plugin/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const nodes = {
"hello": (context) => {
// Use context.nodeBuilder to construct the node UI

console.log("Bogus nodes");
// console.log("Bogus nodes");
}
}

Expand Down
2 changes: 1 addition & 1 deletion blix-plugins/base-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},

"main": "src/main.js",
"renderer": "src/renderer.js",
"renderers": {},

"devDependencies": {
"@types/node": "^12.0.0",
Expand Down
Loading
Loading