Skip to content

Commit 6f5657e

Browse files
committed
Merge branch 'master' of https://github.com/live-keys/livekeys
# Conflicts: # .qmake.conf
2 parents a2711f9 + d3ff879 commit 6f5657e

File tree

3 files changed

+76
-7
lines changed

3 files changed

+76
-7
lines changed

.github/workflows/.build_livekeys.yml

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -180,15 +180,28 @@ jobs:
180180
path: build/*.tar.gz
181181

182182

183-
- name: Get Release
184-
id: get_release
185-
if: startsWith(github.ref, 'refs/tags/v')
183+
- name: Get Release MacOS
184+
id: get_release_macos
185+
if: github.ref == 'refs/heads/master' && runner.os == 'macOS'
186186
run : |
187187
cd build
188188
RELEASE_NAME="$(ls -1 *.dmg)"
189189
echo $RELEASE_NAME
190190
echo ::set-output name=RELEASE_NAME::$RELEASE_NAME
191191
192+
- name: Get Release Linux
193+
id: get_release_linux
194+
if: github.ref == 'refs/heads/master' && runner.os == 'Linux'
195+
run : |
196+
cd build
197+
ls
198+
RELEASE_NAME_1="$(ls live*.tar.gz | tail -n +1 | head -1)"
199+
RELEASE_NAME_2="$(ls live*.tar.gz | tail -n +2 | head -1)"
200+
echo $RELEASE_NAME_1
201+
echo $RELEASE_NAME_2
202+
echo ::set-output name=RELEASE_NAME_1::$RELEASE_NAME_1
203+
echo ::set-output name=RELEASE_NAME_2::$RELEASE_NAME_2
204+
192205
# - name: Create Release
193206
# id: create_release
194207
# if: startsWith(github.ref, 'refs/tags/v')
@@ -208,14 +221,25 @@ jobs:
208221
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
209222

210223

211-
- name: Do Release
212-
id: do_release
213-
if: startsWith(github.ref, 'refs/tags/v')
224+
- name: Do Release MacOS
225+
id: do_release_macos
226+
if: startsWith(github.ref, 'refs/tags/v') && runner.os == 'macOS'
227+
uses: softprops/action-gh-release@v1
228+
env:
229+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
230+
with:
231+
files: build/${{ steps.get_release_macos.outputs.RELEASE_NAME }}
232+
233+
- name: Do Release Linux
234+
id: do_release_linux
235+
if: startsWith(github.ref, 'refs/tags/v') && runner.os == 'Linux'
214236
uses: softprops/action-gh-release@v1
215237
env:
216238
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
217239
with:
218-
files: build/${{ steps.get_release.outputs.RELEASE_NAME }}
240+
files: |
241+
build/${{ steps.get_release_linux.outputs.RELEASE_NAME_1 }}
242+
build/${{ steps.get_release_linux.outputs.RELEASE_NAME_2 }}
219243
220244
# - name: Upload Release Asset
221245
# id: upload-release-asset

CHANGELOG.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,49 @@
22

33
This file summarises notable changes between Live Keys versions.
44

5+
## 1.9.0
6+
7+
### Features
8+
9+
- Added vector editor
10+
- Added layout files
11+
- Added Support for read only properties
12+
- Added Support for chain properties
13+
- Added new color picker
14+
- Fully Integrated Builders and Watchers
15+
- Support for Drawing Gradients
16+
- Support for connecting to singletons
17+
18+
### Bug Fixes
19+
20+
- Fixed saving/restoring palettes
21+
- Fixed TransformPalette in node editor
22+
- Fixed blank DrawPalette crash
23+
- Updated NodePalette connectors
24+
- Fixed Ownership and deletion in palettes
25+
- Fixed binding deletion when deleting an edge in NodePalette
26+
- Fixed some cases where SuggestionBox was hidden
27+
28+
## 1.8.0
29+
30+
### Features
31+
32+
- Added timeline animation tracks
33+
- Support for initializing documents through palettes
34+
- Added messagebox for workspace
35+
- Added new palettes: StringList, Boolean, Size
36+
37+
### Bug Fixes
38+
39+
- Fixed Root item deletion and creation in some contexts
40+
- Fixed reading files sample
41+
- Fixed file explorer sample
42+
- Fixed executable sample run problems on windows
43+
- Fixed same property appearing twice in the node editor
44+
- Fixed ownership on deleting edit fragments
45+
- Fixed various node editor interactions
46+
- Fixed binding connections between edit fragments
47+
548
## 1.7.0
649

750
### Features

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
</a>
99
</p>
1010

11+
-----------------------------
12+
1113
[![Join the chat at https://gitter.im/live-keys/livekeys](https://badges.gitter.im/live-keys/livekeys.svg)](https://gitter.im/live-keys/livekeys?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
1214
[![Build Status](https://travis-ci.com/live-keys/livekeys.svg?branch=master)](https://travis-ci.com/live-keys/livekeys)
1315
[![Build status](https://ci.appveyor.com/api/projects/status/3l5t69h7q3gpkec1?svg=true)](https://ci.appveyor.com/project/dinusv/livekeys)

0 commit comments

Comments
 (0)