Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/live-keys/livekeys
Browse files Browse the repository at this point in the history
# Conflicts:
#	.qmake.conf
  • Loading branch information
dinusv committed Jul 1, 2021
2 parents a2711f9 + d3ff879 commit 6f5657e
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 7 deletions.
38 changes: 31 additions & 7 deletions .github/workflows/.build_livekeys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,15 +180,28 @@ jobs:
path: build/*.tar.gz


- name: Get Release
id: get_release
if: startsWith(github.ref, 'refs/tags/v')
- name: Get Release MacOS
id: get_release_macos
if: github.ref == 'refs/heads/master' && runner.os == 'macOS'
run : |
cd build
RELEASE_NAME="$(ls -1 *.dmg)"
echo $RELEASE_NAME
echo ::set-output name=RELEASE_NAME::$RELEASE_NAME
- name: Get Release Linux
id: get_release_linux
if: github.ref == 'refs/heads/master' && runner.os == 'Linux'
run : |
cd build
ls
RELEASE_NAME_1="$(ls live*.tar.gz | tail -n +1 | head -1)"
RELEASE_NAME_2="$(ls live*.tar.gz | tail -n +2 | head -1)"
echo $RELEASE_NAME_1
echo $RELEASE_NAME_2
echo ::set-output name=RELEASE_NAME_1::$RELEASE_NAME_1
echo ::set-output name=RELEASE_NAME_2::$RELEASE_NAME_2
# - name: Create Release
# id: create_release
# if: startsWith(github.ref, 'refs/tags/v')
Expand All @@ -208,14 +221,25 @@ jobs:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}


- name: Do Release
id: do_release
if: startsWith(github.ref, 'refs/tags/v')
- name: Do Release MacOS
id: do_release_macos
if: startsWith(github.ref, 'refs/tags/v') && runner.os == 'macOS'
uses: softprops/action-gh-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
files: build/${{ steps.get_release_macos.outputs.RELEASE_NAME }}

- name: Do Release Linux
id: do_release_linux
if: startsWith(github.ref, 'refs/tags/v') && runner.os == 'Linux'
uses: softprops/action-gh-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
files: build/${{ steps.get_release.outputs.RELEASE_NAME }}
files: |
build/${{ steps.get_release_linux.outputs.RELEASE_NAME_1 }}
build/${{ steps.get_release_linux.outputs.RELEASE_NAME_2 }}
# - name: Upload Release Asset
# id: upload-release-asset
Expand Down
43 changes: 43 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,49 @@

This file summarises notable changes between Live Keys versions.

## 1.9.0

### Features

- Added vector editor
- Added layout files
- Added Support for read only properties
- Added Support for chain properties
- Added new color picker
- Fully Integrated Builders and Watchers
- Support for Drawing Gradients
- Support for connecting to singletons

### Bug Fixes

- Fixed saving/restoring palettes
- Fixed TransformPalette in node editor
- Fixed blank DrawPalette crash
- Updated NodePalette connectors
- Fixed Ownership and deletion in palettes
- Fixed binding deletion when deleting an edge in NodePalette
- Fixed some cases where SuggestionBox was hidden

## 1.8.0

### Features

- Added timeline animation tracks
- Support for initializing documents through palettes
- Added messagebox for workspace
- Added new palettes: StringList, Boolean, Size

### Bug Fixes

- Fixed Root item deletion and creation in some contexts
- Fixed reading files sample
- Fixed file explorer sample
- Fixed executable sample run problems on windows
- Fixed same property appearing twice in the node editor
- Fixed ownership on deleting edit fragments
- Fixed various node editor interactions
- Fixed binding connections between edit fragments

## 1.7.0

### Features
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
</a>
</p>

-----------------------------

[![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)
[![Build Status](https://travis-ci.com/live-keys/livekeys.svg?branch=master)](https://travis-ci.com/live-keys/livekeys)
[![Build status](https://ci.appveyor.com/api/projects/status/3l5t69h7q3gpkec1?svg=true)](https://ci.appveyor.com/project/dinusv/livekeys)
Expand Down

0 comments on commit 6f5657e

Please sign in to comment.