Skip to content

Commit

Permalink
New version 12.1.0.0 (#5)
Browse files Browse the repository at this point in the history
  • Loading branch information
awawa-dev committed Dec 1, 2020
1 parent e81718f commit 877073f
Show file tree
Hide file tree
Showing 325 changed files with 13,287 additions and 6,564 deletions.
20 changes: 20 additions & 0 deletions .devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "Hyperion.ng Linux",
"extensions": [
"twxs.cmake",
"ms-vscode.cpptools",
"ms-vscode.cmake-tools",
"spmeesseman.vscode-taskexplorer",
"yzhang.markdown-all-in-one",
"CoenraadS.bracket-pair-colorizer",
"vscode-icons-team.vscode-icons",
"editorconfig.editorconfig"
],
"settings": {
"editor.formatOnSave": false,
"cmake.environment": {
},
},
"forwardPorts": [8090, 8092],
"postCreateCommand": "git submodule update --recursive --init && sudo apt-get install -y git cmake build-essential qtbase5-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev libqt5x11extras5-dev libusb-1.0-0-dev python3-dev libcec-dev libxcb-image0-dev libxcb-util0-dev libxcb-shm0-dev libxcb-render0-dev libxcb-randr0-dev libxrandr-dev libxrender-dev libavahi-core-dev libavahi-compat-libdnssd-dev libjpeg-dev libturbojpeg0-dev libssl-dev zlib1g-dev"
}
15 changes: 5 additions & 10 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
---
name: Bug report
about: Create a report to help us improving Hyperion
about: Create a report to help us improving HyperHDR
labels: Waiting For Review
---

<!-- Please don't delete this template or we'll close your issue -->
<!-- Before creating an issue please make sure you are using the latest version of Hyperion. -->
<!-- Before creating an issue please make sure you are using the latest version of HyperHDR. -->

<!-- Please confirm you will submit an issue. -->
<!-- Issues which contain questions or support requests will be closed. -->
<!-- (Update "[ ]" to "[x]" to check a box) -->

- [x] I confirm that this is an issue rather than a question.

<!-- Please ask questions here -->
<!-- https://hyperion-project.org -->

## Bug report

## Bug report, debug log and your config file (optional but could be very helpful)
<!-- In the web interface of the Hyperion config go to System > Logs and paste it content here -->

#### Steps to reproduce

Expand All @@ -29,4 +24,4 @@ labels: Waiting For Review


#### System
<!-- In the web interface of the Hyperion config go to System > About Hyperion and Paste the content of "System info (Github Issue)" here -->
<!-- In the web interface of the Hyperion config go to System > About and Paste the content of "System info (Github Issue)" here -->
82 changes: 30 additions & 52 deletions .github/workflows/push-master.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Hyperion CI Build
name: HyperHDR CI Build
on:
push:
branches-ignore:
Expand All @@ -24,10 +24,10 @@ jobs:
dockerName: Debian Buster (x86_64)
platform: x11
- dockerImage: armv6l
dockerName: Debian Buster (Raspberry Pi v1 & ZERO)
platform: rpi
dockerName: Debian Buster (Raspberry Pi 1 & 2 & ZERO)
platform: rpi
- dockerImage: armv7l
dockerName: Debian Buster (Raspberry Pi 2 & 3)
dockerName: Debian Buster (Raspberry Pi 3 & 4)
platform: rpi

steps:
Expand All @@ -50,9 +50,16 @@ jobs:
if: startsWith(github.event.ref, 'refs/tags')
uses: actions/upload-artifact@v2
with:
path: deploy/Hyper*


path: deploy/Hyper*.deb

# Upload artifacts from commit
#- name: Upload artifacts from commit
# if: (startsWith(github.event.ref, 'refs/tags') != true)
# uses: actions/upload-artifact@v2
# with:
# name: ${{ matrix.dockerImage }}
# path: deploy/Hyper*.deb

######################
###### Windows #######
######################
Expand Down Expand Up @@ -96,10 +103,10 @@ jobs:
MsiExec.exe /passive /X{F0C3E5D1-1ADE-321E-8167-68EF0DE699A5}
MsiExec.exe /passive /X{1D8E6291-B0D5-35EC-8441-6616F567A0F7}
- name: Install Python, NSIS, OpenSSL, TurboJPG, 7zip
- name: Install Python, NSIS, OpenSSL, 7zip
shell: powershell
run: |
choco install --no-progress python nsis openssl libjpeg-turbo 7zip.install -y
choco install --no-progress python nsis openssl 7zip.install -y
- name: Set up x64 build architecture environment
shell: cmd
run: call "${{env.VCINSTALLDIR}}\Auxiliary\Build\vcvars64.bat"
Expand All @@ -116,53 +123,24 @@ jobs:
if: startsWith(github.event.ref, 'refs/tags')
uses: actions/upload-artifact@v2
with:
path: build/Hyper*
path: build/Hyper*.exe

# Upload artifacts from commit
#- name: Upload artifacts from commit
# if: (startsWith(github.event.ref, 'refs/tags') != true)
# uses: actions/upload-artifact@v2
# with:
# name: windows
# path: build/Hyper*.exe

######################
#### Documentation ###
######################

Docs:
name: Documentation
runs-on: ubuntu-20.04
defaults:
run:
working-directory: docs
steps:
- name: Checkout
uses: actions/checkout@v2

# Install dependencies
- name: Setup node 12
uses: actions/setup-node@v1
with:
node-version: '12'

# Build Docs
- name: Build docs
run: |
cd docs
npm install -g yarn
yarn install
yarn docs:build
# Deploy to gh-pages (only on tagged commit)
- name: Deploy to gh-pages
if: startsWith(github.event.ref, 'refs/tags')
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs/dist
cname: docs.hyperion-project.org

################################
###### Publish Releases ########
################################

publish:
name: Publish Releases
if: startsWith(github.event.ref, 'refs/tags')
needs: [Linux, windows, Docs]
needs: [Linux, windows]
runs-on: ubuntu-20.04
steps:
- name: Checkout
Expand All @@ -171,14 +149,14 @@ jobs:
# generate environment variables
- name: Generate environment variables from version and tag
run: |
echo ::set-env name=TAG::${GITHUB_REF/refs\/tags\//}
echo ::set-env name=VERSION::$(tr -d '\n' < version)
echo ::set-env name=preRelease::false
echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
echo "VERSION=$(tr -d '\n' < version)" >> $GITHUB_ENV
echo "preRelease=false" >> $GITHUB_ENV
# If version contains alpha or beta, mark draft release as pre-release
- name: Mark release as pre-release
if: contains(env.VERSION, 'alpha') || contains(env.VERSION, 'beta')
run: echo ::set-env name=preRelease::true
run: echo "preRelease=true" >> $GITHUB_ENV

# Download artifacts from previous build process
- name: Download artifacts
Expand Down
17 changes: 0 additions & 17 deletions .github/workflows/release.yml

This file was deleted.

7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,10 @@ compile_commands.json
# Autogenerated by flatbuffers
libsrc/flatbufserver/hyperion_reply_generated.h
libsrc/flatbufserver/hyperion_request_generated.h

# Kdevelop project files
*.kdev*

# Visual Studio 2015/2017/2019 cache/options directory
.vs/
CMakeSettings.json
2 changes: 0 additions & 2 deletions .vscode/hyperion.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@
"ms-vscode.cmake-tools",
"spmeesseman.vscode-taskexplorer",
"yzhang.markdown-all-in-one",
"formulahendry.auto-rename-tag",
"CoenraadS.bracket-pair-colorizer",
"eamodio.gitlens",
"vscode-icons-team.vscode-icons",
"editorconfig.editorconfig"
]
Expand Down
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"type": "cppdbg",
"request": "launch",
"program": "${workspaceFolder}/build/bin/hyperiond",
"args": [],
"args": ["-d"],
"stopAtEntry": false,
"cwd": "${workspaceFolder}",
"environment": [],
Expand All @@ -28,7 +28,7 @@
"type": "cppvsdbg",
"request": "launch",
"program": "${workspaceFolder}/build/bin/Debug/hyperiond.exe",
"args": [],
"args": ["-d"],
"stopAtEntry": false,
"cwd": "${workspaceFolder}",
"environment": [],
Expand Down
4 changes: 2 additions & 2 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"windows": {
"command": "cmake -G \"Visual Studio 16 2019\" -A x64 -B ${workspaceFolder}/build"
},
"group": "build",
"group": "build"
},
{
"label": "cmake:conf Debug",
Expand All @@ -21,7 +21,7 @@
"windows": {
"command": "cmake -G \"Visual Studio 16 2019\" -A x64 -B ${workspaceFolder}/build"
},
"group": "build",
"group": "build"
},
{
"label": "build:debug hyperiond",
Expand Down

0 comments on commit 877073f

Please sign in to comment.