nils/shairport-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/development'

Browse Source
This commit is contained in:
Mike Brady
2022-09-15 17:28:47 +01:00
parent 4eaf456a39 694c9f5ad6
commit 2fa744419d
112 changed files with 23640 additions and 4301 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/FUNDING.yml
+1 -1
View File
@@ -1 +1 @@
custom: [paypal.me/UMBr]
custom: [paypal.me/UMBr]
.github/ISSUE_TEMPLATE/Bug Report.yaml
+21
View File
@@ -1,12 +1,23 @@
<<<<<<< HEAD
name: Issue Report
description: File an Issue
title: "[Problem]: "
labels: ["new issue"]
=======
name: Bug Report
description: File a bug report
title: "[Bug]: "
labels: ["bug"]
>>>>>>> origin/development
body:
- type: markdown
attributes:
value: |
<<<<<<< HEAD
Thanks for taking the time to fill out this report!
=======
Thanks for taking the time to fill out this bug report!
>>>>>>> origin/development
- type: textarea
id: what-happened
attributes:
@@ -21,6 +32,7 @@ body:
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
render: shell
- type: textarea
<<<<<<< HEAD
id: os
attributes:
label: Operating System?
@@ -28,12 +40,15 @@ body:
validations:
required: true
- type: textarea
=======
>>>>>>> origin/development
id: version
attributes:
label: Version?
description: What version of Shairport Sync are you running? (`shairport-sync -V`)
validations:
required: true
<<<<<<< HEAD
- type: dropdown
id: install
attributes:
@@ -45,6 +60,8 @@ body:
- Built from source
validations:
required: true
=======
>>>>>>> origin/development
- type: checkboxes
id: checked-current-issues
attributes:
@@ -52,4 +69,8 @@ body:
description: Please check previous issues (including closed ones) for duplicates.
options:
- label: Confirm
<<<<<<< HEAD
required: true
=======
required: true
>>>>>>> origin/development
.github/workflows/docker-build-on-push.yaml
+32 -4
View File
@@ -1,5 +1,5 @@
# Builds & pushes a docker image when a commit is made to one of the branches specified below.
# Tag pattern: 'unstable-[BRANCH NAME]'.
# Builds & pushes a docker image when a commit is made to one of the branches specified below.
# Tag pattern: 'unstable-[BRANCH NAME]' & 'unstable-[BRANCH NAME]-classic'
name: Build and push docker image based on commit to specified branches.
@@ -22,6 +22,14 @@ jobs:
- name: Set SHAIRPORT_SYNC_BRANCH env.
run: echo "SHAIRPORT_SYNC_BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
- name: Determine NQPTP env (part 1).
if: ${{ env.SHAIRPORT_SYNC_BRANCH == 'development' }}
run: echo "NQPTP_BRANCH=development" >> $GITHUB_ENV
- name: Determine NQPTP env (part 2).
if: ${{ env.SHAIRPORT_SYNC_BRANCH != 'development' }}
run: echo "NQPTP_BRANCH=main" >> $GITHUB_ENV
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
@@ -35,13 +43,33 @@ jobs:
username: ${{ secrets.DOCKER_REGISTRY_USER }}
password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
- name: Set tag start (part 1).
if: ${{ env.SHAIRPORT_SYNC_BRANCH == 'master' }}
run: echo "IMAGE_TAG_BASE=unstable" >> $GITHUB_ENV
- name: Set tag start (part 2).
if: ${{ env.SHAIRPORT_SYNC_BRANCH != 'master' }}
run: echo "IMAGE_TAG_BASE=unstable-${{ env.SHAIRPORT_SYNC_BRANCH }}" >> $GITHUB_ENV
- name: Build and push
uses: docker/build-push-action@v2
with:
context: ./
file: ./docker/airplay1/Dockerfile
file: ./docker/Dockerfile
platforms: ${{ env.DOCKER_PLATFORMS }}
push: true
tags: ${{ secrets.DOCKER_IMAGE_NAME }}:unstable-${{ env.SHAIRPORT_SYNC_BRANCH }}
tags: ${{ secrets.DOCKER_IMAGE_NAME }}:${{ env.IMAGE_TAG_BASE }}
build-args: |
SHAIRPORT_SYNC_BRANCH=${{ env.SHAIRPORT_SYNC_BRANCH }}
NQPTP_BRANCH=${{ env.NQPTP_BRANCH }}
- name: Build and push (AirPlay 1)
uses: docker/build-push-action@v2
with:
context: ./
file: ./docker/classic/Dockerfile
platforms: ${{ env.DOCKER_PLATFORMS }}
push: true
tags: ${{ secrets.DOCKER_IMAGE_NAME }}:${{ env.IMAGE_TAG_BASE }}-classic
build-args: |
SHAIRPORT_SYNC_BRANCH=${{ env.SHAIRPORT_SYNC_BRANCH }}
.github/workflows/docker-build-on-tag.yaml
+24 -4
View File
@@ -1,8 +1,8 @@
# Builds & pushes a docker image when a tag occurs.
# It seems this yaml has to exist on the branch the tag refers to.
# The following tags are created & pushed:
# [RELEASE TAG] and latest
# The following docker tags are created & pushed:
# [RELEASE TAG], [RELEASE TAG]-classic,
name: Build and push docker images on releases.
@@ -31,6 +31,14 @@ jobs:
- name: Set tag env
run: echo "GIT_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Determine NQPTP env (part 1).
if: ${{ env.SHAIRPORT_SYNC_BRANCH == 'development' }}
run: echo "NQPTP_BRANCH=development" >> $GITHUB_ENV
- name: Determine NQPTP env (part 2).
if: ${{ env.SHAIRPORT_SYNC_BRANCH != 'development' }}
run: echo "NQPTP_BRANCH=main" >> $GITHUB_ENV
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
@@ -49,9 +57,21 @@ jobs:
uses: docker/build-push-action@v2
with:
context: ./
file: ./docker/airplay1/Dockerfile
file: ./docker/Dockerfile
platforms: ${{ env.DOCKER_PLATFORMS }}
push: true
tags: ${{ secrets.DOCKER_IMAGE_NAME }}:latest, ${{ secrets.DOCKER_IMAGE_NAME }}:${{ env.GIT_TAG }}
tags: ${{ secrets.DOCKER_IMAGE_NAME }}:${{ env.GIT_TAG }}
build-args: |
SHAIRPORT_SYNC_BRANCH=${{ env.SHAIRPORT_SYNC_BRANCH }}
NQPTP_BRANCH=${{ env.NQPTP_BRANCH }}
- name: Build and push (Classic)
uses: docker/build-push-action@v2
with:
context: ./
file: ./docker/classic/Dockerfile
platforms: ${{ env.DOCKER_PLATFORMS }}
push: true
tags: ${{ secrets.DOCKER_IMAGE_NAME }}:${{ env.GIT_TAG }}-classic
build-args: |
SHAIRPORT_SYNC_BRANCH=${{ env.SHAIRPORT_SYNC_BRANCH }}