mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
Systemd changes | root script | URL support for gif effects (#1319)
* Systemd changes and URL option for Gif Effects * Add grayscale to gif effect * WebUI adjustments * Rename version to .version * Copy runHyperionAsRoot.sh to rpi packages * Pack script into all unix packages * Start hyperion only after network is available * Snap builds removed due to poor server connection * Flexible updateHyperionUser.sh * updateHyperionUser script entered in the package * Print help on none sudo execute * Corrected embedded Python location * Replacement for the QWindowsScreen grabWindow function * Updated to latest 2.x mbedtls version 2.27 Co-authored-by: LordGrey <lordgrey.emmel@gmail.com>
This commit is contained in:
Markus
GitHub
4
.github/workflows/apt.yml
vendored
4
.github/workflows/apt.yml
vendored
@@ -35,7 +35,7 @@ jobs:
|
||||
- name: Build package
|
||||
shell: bash
|
||||
run: |
|
||||
tr -d '\n' < version > temp && mv temp version
|
||||
tr -d '\n' < .version > temp && mv temp .version
|
||||
mkdir -p "${GITHUB_WORKSPACE}/deploy"
|
||||
docker run --rm \
|
||||
-v "${GITHUB_WORKSPACE}/deploy:/deploy" \
|
||||
@@ -43,7 +43,7 @@ jobs:
|
||||
ghcr.io/hyperion-project/${{ matrix.architecture }}:$(echo ${{ matrix.distribution }} | tr '[:upper:]' '[:lower:]') \
|
||||
/bin/bash -c "cd /source && \
|
||||
mkdir -p debian/source && echo '3.0 (quilt)' > debian/source/format && \
|
||||
dch --create --distribution $(echo ${{ matrix.distribution }} | tr '[:upper:]' '[:lower:]') --package 'hyperion' -v '$(cat version)~$(echo ${{ matrix.distribution }} | tr '[:upper:]' '[:lower:]')' '${{ github.event.commits[0].message }}' && \
|
||||
dch --create --distribution $(echo ${{ matrix.distribution }} | tr '[:upper:]' '[:lower:]') --package 'hyperion' -v '$(cat .version)~$(echo ${{ matrix.distribution }} | tr '[:upper:]' '[:lower:]')' '${{ github.event.commits[0].message }}' && \
|
||||
cp -fr LICENSE debian/copyright && \
|
||||
sed 's/@BUILD_DEPENDS@/${{ matrix.build-depends }}/g; s/@DEPENDS@/${{ matrix.package-depends }}/g; s/@ARCHITECTURE@/${{ matrix.architecture }}/g' debian/control.in > debian/control && \
|
||||
tar cf ../hyperion_2.0.0.orig.tar . && \
|
||||
|
||||
42
.github/workflows/pull-request.yml
vendored
42
.github/workflows/pull-request.yml
vendored
@@ -36,12 +36,12 @@ jobs:
|
||||
with:
|
||||
submodules: true
|
||||
|
||||
# Append PR number to version
|
||||
# Append PR number to .version
|
||||
- name: Append PR number to version
|
||||
shell: bash
|
||||
run: |
|
||||
tr -d '\n' < version > temp && mv temp version
|
||||
echo -n "+PR${{ github.event.pull_request.number }}" >> version
|
||||
tr -d '\n' < .version > temp && mv temp .version
|
||||
echo -n "+PR${{ github.event.pull_request.number }}" >> .version
|
||||
|
||||
# Build packages
|
||||
- name: Build packages
|
||||
@@ -82,12 +82,12 @@ jobs:
|
||||
with:
|
||||
submodules: true
|
||||
|
||||
# Append PR number to version
|
||||
# Append PR number to .version
|
||||
- name: Append PR number to version
|
||||
shell: bash
|
||||
run: |
|
||||
tr -d '\n' < version > temp && mv temp version
|
||||
echo -n "+PR${{ github.event.pull_request.number }}" >> version
|
||||
tr -d '\n' < .version > temp && mv temp .version
|
||||
echo -n "+PR${{ github.event.pull_request.number }}" >> .version
|
||||
|
||||
# Install dependencies
|
||||
- name: Install dependencies
|
||||
@@ -131,12 +131,12 @@ jobs:
|
||||
with:
|
||||
submodules: true
|
||||
|
||||
# Append PR number to version
|
||||
# Append PR number to .version
|
||||
- name: Append PR number to version
|
||||
shell: bash
|
||||
run: |
|
||||
tr -d '\n' < version > temp && mv temp version
|
||||
echo -n "+PR${{ github.event.pull_request.number }}" >> version
|
||||
tr -d '\n' < .version > temp && mv temp .version
|
||||
echo -n "+PR${{ github.event.pull_request.number }}" >> .version
|
||||
|
||||
- name: Cache Qt
|
||||
uses: actions/cache@v2
|
||||
@@ -199,27 +199,3 @@ jobs:
|
||||
with:
|
||||
name: windows
|
||||
path: windows
|
||||
|
||||
##########################
|
||||
#### Snap (x86_64) #######
|
||||
##########################
|
||||
|
||||
snap:
|
||||
name: Snap (x86_64)
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
|
||||
# Build snap package
|
||||
- name: Build snap
|
||||
id: build
|
||||
uses: snapcore/action-build@v1
|
||||
|
||||
# Upload snap artifact (only on tagged commit)
|
||||
- name: Upload snap artifact
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: snap
|
||||
path: ${{ steps.build.outputs.snap }}
|
||||
|
||||
61
.github/workflows/push-master.yml
vendored
61
.github/workflows/push-master.yml
vendored
@@ -156,31 +156,6 @@ jobs:
|
||||
with:
|
||||
path: build/Hyperion-*
|
||||
|
||||
##########################
|
||||
#### Snap (x86_64) #######
|
||||
##########################
|
||||
|
||||
snap:
|
||||
name: Snap (x86_64)
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
|
||||
# Build snap package
|
||||
- name: Build snap
|
||||
id: build
|
||||
uses: snapcore/action-build@v1
|
||||
|
||||
# Upload snap artifact (only on tagged commit)
|
||||
- name: Upload snap artifact
|
||||
if: startsWith(github.event.ref, 'refs/tags')
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: snap
|
||||
path: ${{ steps.build.outputs.snap }}
|
||||
|
||||
#######################################
|
||||
###### Publish GitHub Releases ########
|
||||
#######################################
|
||||
@@ -195,10 +170,10 @@ jobs:
|
||||
uses: actions/checkout@v2
|
||||
|
||||
# generate environment variables
|
||||
- name: Generate environment variables from version and tag
|
||||
- name: Generate environment variables from .version and tag
|
||||
run: |
|
||||
echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
|
||||
echo "VERSION=$(tr -d '\n' < version)" >> $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
|
||||
@@ -223,35 +198,3 @@ jobs:
|
||||
prerelease: ${{ env.preRelease }}
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
############################
|
||||
###### Snap Release ########
|
||||
############################
|
||||
|
||||
snap_publish:
|
||||
name: Publish Snap Release
|
||||
if: startsWith(github.event.ref, 'refs/tags')
|
||||
needs: [snap]
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
|
||||
# Download snap from snap job
|
||||
- name: Download snap from snap build
|
||||
id: download-artifact
|
||||
uses: actions/download-artifact@v2
|
||||
with:
|
||||
name: snap
|
||||
|
||||
# Get file name of the snap
|
||||
- name: Get file name of the snap
|
||||
run: echo "snap=$(ls ${{ steps.download-artifact.outputs.download-path }}/hyperion-ng_*.snap)" >> $GITHUB_ENV
|
||||
|
||||
# Publish snap build to edge channel
|
||||
- name: Publish snap build to edge channel
|
||||
uses: snapcore/action-publish@v1
|
||||
with:
|
||||
store_login: ${{ secrets.SNAP_STORE_LOGIN }}
|
||||
snap: ${{ env.snap }}
|
||||
release: edge
|
||||
|
||||
Reference in New Issue
Block a user