Skip to content

Commit

Permalink
Merge branch 'develop' into fix/documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
AlvinSchiller committed Oct 26, 2023
2 parents 75c7614 + da59be5 commit dbe8938
Show file tree
Hide file tree
Showing 52 changed files with 588 additions and 1,134 deletions.
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
77 changes: 0 additions & 77 deletions .github/workflows/docker_bullseye.yml

This file was deleted.

65 changes: 0 additions & 65 deletions .github/workflows/docker_bullseye_altuser.yml

This file was deleted.

64 changes: 0 additions & 64 deletions .github/workflows/docker_buster.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup PHP with XDebug
uses: shivammathur/setup-php@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
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 Down
58 changes: 0 additions & 58 deletions .github/workflows/pythonpackage_future3.yml

This file was deleted.

37 changes: 37 additions & 0 deletions .github/workflows/test_docker_debian.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Test Install Scripts Debian

on:
schedule:
# run at 5:00 every sunday
- cron: '0 5 * * 0'
push:
branches-ignore:
- 'future3/**'
pull_request:
# The branches below must be a subset of the branches above
branches: [ develop ]

# 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_version_name }}
strategy:
fail-fast: false
matrix:
debian_version_name: ['bullseye', 'buster']
uses: ./.github/workflows/test_docker_debian_versionname_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_version_name: ${{ matrix.debian_version_name }}
Loading

0 comments on commit dbe8938

Please sign in to comment.