Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 2.5 #2030

Merged
merged 82 commits into from
Dec 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
cf57396
Updated Python versions to use for CI (#1933)
s-martin Dec 23, 2022
d2acaad
Update README.md
Dec 30, 2022
800b06f
Create php.yml (#1823)
s-martin Dec 30, 2022
439fbd0
add badge for PHP CI (#1947)
s-martin Dec 30, 2022
815e7f1
Phoniebox Calendar 2023
MiczFlor Jan 2, 2023
750ab70
Including new calendar 2023
MiczFlor Jan 2, 2023
cdf0d4a
Cal 2023 new colors
MiczFlor Jan 2, 2023
33b7173
Delete 2023-Phoniebox-Calendar.jpg
MiczFlor Jan 2, 2023
4812b81
Cal 2023 new colours
MiczFlor Jan 2, 2023
0416d48
Update README.md
MiczFlor Jan 2, 2023
6dfeb55
Update README.md
MiczFlor Jan 2, 2023
39a2f0f
Remove Gmusic (#1939)
s-martin Jan 21, 2023
701bee8
Delete scripts/python-phoniebox directory (#1935)
s-martin Jan 21, 2023
46d5d0d
Clarify when to open an issue or a discussion (#1961)
s-martin Jan 24, 2023
58abfc6
Bump phpunit/phpunit from 9.5.27 to 9.5.28 (#1965)
dependabot[bot] Feb 1, 2023
f4cd4e4
Fix Pirate Audio Button Volume Up (#1975)
s-martin Feb 26, 2023
10181b1
Bump phpunit/phpunit from 9.5.28 to 9.6.4 (#1976)
dependabot[bot] Mar 2, 2023
cc6cc64
add patch for serializable (#1953)
s-martin Mar 2, 2023
b854286
Use existing actions for Docker GitHub Action (#1980)
s-martin Mar 4, 2023
29edd74
removed "is set" check (#1967) (#1968)
AlvinSchiller Mar 10, 2023
927520c
Fix docs for 2.x (#1949)
s-martin Mar 12, 2023
3bebe59
Close devices (#1985)
s-martin Mar 12, 2023
b943248
Added check for state in shutdown button handler (#1984)
topas-rec Mar 12, 2023
70b0bc5
Feature "sync shared" (#1978)
AlvinSchiller Mar 12, 2023
ac17907
Update CODEOWNERS
s-martin Mar 12, 2023
7de55e1
Delete stretch install scripts (#1936)
s-martin Mar 12, 2023
ca75406
Add bullseye Dockerfile (#1986)
s-martin Mar 12, 2023
3901c69
Test files not used anymore (#1988)
s-martin Mar 16, 2023
61e2bde
added python 3.10 to version matrix (#1996)
AlvinSchiller Mar 19, 2023
3e9fc25
new python dependecies added (#1990)
AlvinSchiller Mar 26, 2023
c8cfa17
Bump phpunit/phpunit from 9.6.4 to 9.6.6 (#2004)
dependabot[bot] Apr 2, 2023
0350d07
Bump php-mock/php-mock-phpunit from 2.6.1 to 2.7.1 (#2005)
dependabot[bot] Apr 2, 2023
1314d39
Add armv7 Docker test (#1992)
s-martin Apr 3, 2023
5a416c2
Improve the docs
s-martin Apr 28, 2023
34121a2
Improve docs
s-martin Apr 29, 2023
f97f945
Added links to discussions
s-martin Apr 29, 2023
247d03f
Fix #1848 (#2017)
s-martin May 1, 2023
6025bfa
Bump phpunit/phpunit from 9.6.6 to 9.6.7 (#2021)
dependabot[bot] May 2, 2023
7e785e9
Add docker
s-martin May 2, 2023
af98361
set indent_size of 2 for js and yaml files (#2027)
AlvinSchiller May 5, 2023
bdb4de8
add Coverage action (#2032)
s-martin May 10, 2023
6aef729
Add coverage badge
s-martin May 10, 2023
a0325c4
Bump phpunit/phpunit from 9.6.7 to 9.6.8 (#2037)
dependabot[bot] Jun 2, 2023
e7a8bf9
Bump docker/setup-qemu-action from 2.1.0 to 2.2.0 (#2043)
dependabot[bot] Jul 2, 2023
6102d3d
Bump docker/setup-buildx-action from 2.5.0 to 2.8.0 (#2042)
dependabot[bot] Jul 2, 2023
339e836
Bump phpunit/phpunit from 9.6.8 to 9.6.9 (#2045)
dependabot[bot] Jul 2, 2023
7f086ef
Bump php-mock/php-mock-phpunit from 2.7.1 to 2.7.2 (#2044)
dependabot[bot] Jul 2, 2023
0bb3833
Bump docker/setup-buildx-action from 2.8.0 to 2.9.1 (#2052)
dependabot[bot] Aug 17, 2023
83afd65
Bump docker/setup-buildx-action from 2.9.1 to 2.10.0 (#2062)
dependabot[bot] Sep 1, 2023
015897e
Bump phpunit/phpunit from 9.6.9 to 9.6.11 (#2061)
dependabot[bot] Sep 1, 2023
52f30de
Make test gpio control work again (#2034)
topas-rec Sep 2, 2023
fabe48e
Bump mopidy-iris from 3.54.2 to 3.68.0 (#2060)
dependabot[bot] Sep 2, 2023
6ef0c24
Bump docker/setup-buildx-action from 2.10.0 to 3.0.0 (#2069)
dependabot[bot] Oct 1, 2023
5a350a1
Bump actions/checkout from 3 to 4 (#2072)
dependabot[bot] Oct 1, 2023
aef2dc3
Bump docker/build-push-action from 4 to 5 (#2071)
dependabot[bot] Oct 1, 2023
442e17c
Bump phpunit/phpunit from 9.6.11 to 9.6.13 (#2068)
dependabot[bot] Oct 1, 2023
a003088
Bump docker/setup-qemu-action from 2.2.0 to 3.0.0 (#2070)
dependabot[bot] Oct 1, 2023
7253971
Abort installation if user is not "pi" (#2076)
AlvinSchiller Oct 10, 2023
0079ff6
Fixes rc-522, see also #2075 (#2078)
s-martin Oct 10, 2023
61962f9
fix some warnings (#2081)
s-martin Oct 18, 2023
597d6ee
Unified Test runs in Docker (#2082)
AlvinSchiller Oct 20, 2023
da59be5
Update Status Badge (#2083)
AlvinSchiller Oct 20, 2023
58b3b13
Bump mopidy-iris from 3.68.0 to 3.69.2 (#2088)
dependabot[bot] Nov 3, 2023
7c06608
Bump php-mock/php-mock-phpunit from 2.7.2 to 2.8.0 (#2089)
dependabot[bot] Nov 3, 2023
c568882
Merge Autohotspot setup into main install script (#2086)
AlvinSchiller Nov 4, 2023
38a02f6
add autohotspot config checks (#2091)
AlvinSchiller Nov 5, 2023
093cc61
Make changes for Raspberry Pi OS Bookworm (#2084)
s-martin Nov 8, 2023
0457616
Update Documentation (#2008)
AlvinSchiller Nov 8, 2023
f610e5e
Further Optimizations (#2092)
AlvinSchiller Nov 9, 2023
54ee74d
rename install script to "install-jukebox.sh" (#2110)
AlvinSchiller Nov 14, 2023
332b239
Fixing paths to future3 docs
s-martin Nov 25, 2023
2b03969
Bump coverallsapp/github-action from 1 to 2 (#2129)
dependabot[bot] Dec 1, 2023
51ad2a5
Bump phpunit/phpunit from 9.6.13 to 9.6.15 (#2130)
dependabot[bot] Dec 1, 2023
465d158
Bump php-mock/php-mock-phpunit from 2.8.0 to 2.9.0 (#2131)
dependabot[bot] Dec 1, 2023
4a190f2
Bookworm Web Interface 403 (#2128)
AlvinSchiller Dec 2, 2023
b9f5028
feat: add stop/shutdown by rfid after 120,180,240min (#2134)
t0b3 Dec 4, 2023
fbcfd89
Update README.md
s-martin Dec 4, 2023
c1ef80a
Update for v3 releases
AlvinSchiller Dec 12, 2023
c9254cf
Update for v2 releases
AlvinSchiller Dec 12, 2023
b3d1374
add workflow for release automation (#2171)
AlvinSchiller Dec 20, 2023
588cc5d
Updates for next release (#2175)
AlvinSchiller Dec 21, 2023
ecca988
Update version-number for next release 2.5.0
AlvinSchiller Dec 21, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*/temp*
*/*/temp*
*.md
.git
.github
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ indent_size = 4

[*.md]
trim_trailing_whitespace = false

[*.{js,yaml,yml}]
indent_size = 2
5 changes: 3 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/components/controls/buttons_usb_encoder/ @jeripeierSBB
/scripts/installscripts/buster-install-default.sh @jeripeierSBB
/scripts/installscripts/buster-install-default-with-autohotspot.sh @jeripeierSBB
/components/synchronisation/sync-shared @AlvinSchiller
/scripts/installscripts/install-jukebox.sh @jeripeierSBB
/scripts/helperscripts/setup_autohotspot.sh @Groovylein
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ labels: bug, needs triage
### What I did

<!--
i.e. `I installed the raspberry pi with above mentioned buster image and ran the installer script`
i.e. `I installed the raspberry pi with below mentioned image and ran the installer script`
-->

### What happened
Expand Down Expand Up @@ -56,7 +56,7 @@ the following command will help with that
### Installscript

<!--
i.e. `scripts/installscripts/buster-install-default.sh`
i.e. `scripts/installscripts/install-jukebox.sh`
-->


Expand Down
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
blank_issues_enabled: true
contact_links:
- name: 🤔 Questions and Help
url: https://github.com/MiczFlor/RPi-Jukebox-RFID/discussions/new?category=q-a
about: This issue tracker is not for support questions. Please refer to our Discussions.
- name: 💬 Chat
url: https://matrix.to/#/#phoniebox_community:gitter.im
about: Want to discuss with others? Check out our chat.
5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@ updates:
directory: "/"
schedule:
interval: "monthly"

- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "monthly"
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
30 changes: 0 additions & 30 deletions .github/workflows/dockerimage.yml

This file was deleted.

46 changes: 46 additions & 0 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: PHP Composer

on:
push:
branches: [ develop ]
pull_request:
branches: [ develop ]

permissions:
contents: read

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Setup PHP with XDebug
uses: shivammathur/setup-php@v2
with:
php-version: 7.3
coverage: xdebug
tools: composer

- name: Validate composer.json and composer.lock
run: composer validate --strict

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v3
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-

- name: Install dependencies
run: composer install --prefer-dist --no-progress

# Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
# Docs: https://getcomposer.org/doc/articles/scripts.md

- name: Run test suite
run: composer run-script test # run not all tests, see composer.json
23 changes: 20 additions & 3 deletions .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.6, 3.7, 3.8]
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
Expand All @@ -40,4 +40,21 @@ jobs:
working-directory: ./components/gpio_control
run: |
pip install -r requirements.txt
pytest
pytest --cov --cov-report xml
- name: Report to Coveralls (parallel)
uses: coverallsapp/github-action@v2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
file: ./components/gpio_control/coverage.xml
format: cobertura
parallel: true

finish:
needs: build
runs-on: ubuntu-latest
steps:
- name: Close parallel build
uses: coverallsapp/github-action@v2
with:
parallel-finished: true
#carryforward: "run-1,run-2"
58 changes: 0 additions & 58 deletions .github/workflows/pythonpackage_future3.yml

This file was deleted.

96 changes: 96 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
name: Release

on:
push:
branches:
- 'master'

jobs:

check:
if: ${{ github.repository_owner == 'MiczFlor' }}
runs-on: ubuntu-latest

outputs:
tag_name: ${{ steps.vars.outputs.tag_name }}
release_type: ${{ steps.vars.outputs.release_type }}
check_abort: ${{ steps.vars.outputs.check_abort }}

steps:
- uses: actions/checkout@v3

- name: Set Output vars
id: vars
env:
BRANCH_NAME: ${{ github.ref_name }}
run: |
# Official SemVer Regex definition
# https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
# Needed changes to the regex:
# - '?:' capture command needed to be removed as it wasn't working in shell
# - '\d' had to be replaced with [0-9]
#
# Release versions like 1.0.0, 3.5.0, 100.4.50000+metadata
REGEX_VERSION_RELEASE="^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))?$"
#
# Prerelease versions like 1.0.0-alpha, 3.5.0-whatsoever.12, 100.4.50000-identifier.12+metadata
REGEX_VERSION_PRERELEASE="^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-((0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*))?(\+([0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*))?$"


# Get the version and calculate release type
VERSION=$(cat ./settings/version-number)
if echo "$VERSION" | grep -qoE "$REGEX_VERSION_RELEASE" ; then
RELEASE_TYPE=release
elif echo "$VERSION" | grep -qoE "$REGEX_VERSION_PRERELEASE" ; then
RELEASE_TYPE=prerelease
else
RELEASE_TYPE=none
fi

if [ "$BRANCH_NAME" == 'master' -a "$RELEASE_TYPE" == 'release' ] ; then
CHECK_ABORT=false
else
echo "::notice title=Abort due to not matching ${RELEASE_TYPE} version for branch!::'${VERSION}' on '${BRANCH_NAME}'"
CHECK_ABORT=true
fi

echo "::group::Output values"
echo "Version: ${VERSION}"
echo "RELEASE_TYPE: ${RELEASE_TYPE}"
echo "BRANCH_NAME: ${BRANCH_NAME}"
echo "CHECK_ABORT: ${CHECK_ABORT}"

echo "tag_name=v${VERSION}" >> $GITHUB_OUTPUT
echo "release_type=${RELEASE_TYPE}" >> $GITHUB_OUTPUT
echo "branch_name=${BRANCH_NAME}" >> $GITHUB_OUTPUT
echo "check_abort=${CHECK_ABORT}" >> $GITHUB_OUTPUT
echo "::endgroup::"

release:
needs: [check]
if: ${{ needs.check.outputs.check_abort == 'false' }}
runs-on: ubuntu-latest

concurrency:
group: ${{ needs.check.outputs.tag_name }}

permissions:
contents: write

steps:
- name: Create Release
uses: ncipollo/release-action@v1
with:
commit: ${{ github.sha }}
tag: ${{ needs.check.outputs.tag_name }}
body: "Automated Release for ${{ needs.check.outputs.tag_name }}"
makeLatest: ${{ needs.check.outputs.release_type == 'release' }}
prerelease: ${{ needs.check.outputs.release_type == 'prerelease' }}
generateReleaseNotes: ${{ needs.check.outputs.release_type == 'release' }}
skipIfReleaseExists: false
allowUpdates: true
removeArtifacts: false
replacesArtifacts: false
omitBodyDuringUpdate: true
omitNameDuringUpdate: true
token: ${{ secrets.GITHUB_TOKEN }}
55 changes: 55 additions & 0 deletions .github/workflows/test_docker_debian.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Test Install Scripts Debian

on:
schedule:
# run at 5:00 every sunday
- cron: '0 5 * * 0'
push:
branches-ignore:
- 'future3/**'
paths:
- 'ci/**'
- 'misc/sampleconfigs/**'
- 'scripts/helperscripts/setup_*'
- 'scripts/installscripts/**'
- 'settings/version-number'
- 'packages*.txt'
- 'requirements*.txt'
pull_request:
# The branches below must be a subset of the branches above
branches:
- develop
- main
paths:
- 'ci/**'
- 'misc/sampleconfigs/**'
- 'scripts/helperscripts/setup_*'
- 'scripts/installscripts/**'
- 'settings/version-number'
- 'packages*.txt'
- 'requirements*.txt'

# let only one instance run the test so cache is not corrupted.
# cancel already running instances as only the last run will be relevant
concurrency:
group: ${{ github.ref }}-test-debian
cancel-in-progress: true

jobs:

# Build container and run tests
run:
name: ${{ matrix.debian_codename }}
strategy:
fail-fast: false
matrix:
debian_codename: ['bookworm', 'bullseye', 'buster']
uses: ./.github/workflows/test_docker_debian_codename_sub.yml
with:
runs_on: ubuntu-latest
platform: linux/arm/v7
docker_image_name: rpi-jukebox-rfid
cache_scope: ${{ github.ref }}-test-debian
matrix_usernames: "['pi', 'hans']"
matrix_test_scripts: "['run_installation_tests.sh', 'run_installation_tests2.sh', 'run_installation_tests3.sh']"
debian_codename: ${{ matrix.debian_codename }}
Loading
Loading