Skip to content

Commit

Permalink
Merge branch 'master' into pre-release
Browse files Browse the repository at this point in the history
  • Loading branch information
HomeAutoUser committed Dec 18, 2023
2 parents 38d50b1 + 5c2e41e commit 147f75f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/prove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ jobs:
jsontest:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.5.3
- uses: shogo82148/actions-setup-perl@v1.22.0
- uses: actions/checkout@v4.1.1
- uses: shogo82148/actions-setup-perl@v1.25.0
with:
perl-version: '5.32'
install-modules-with: cpanm
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ jobs:
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
id: extract_branch
- name: Checkout Repostory
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4.1.1
with:
fetch-depth: 0
- name: update controls files
uses: fhem/fhem-controls-actions@v2.1.1
uses: fhem/fhem-controls-actions@V2.2.1
with:
filename: controls_SD_TOOL.txt
- name: update controls files (append)
uses: fhem/fhem-controls-actions@v2.1.1
uses: fhem/fhem-controls-actions@V2.2.1
with:
filename: controls_SD_TOOL.txt
writemode: a
Expand All @@ -38,7 +38,7 @@ jobs:
git add CHANGED ${CONTROLS_FILENAME} || true
git log -n1 --grep="^Automaitc updated controls" --format=format:%H | xargs -n 1 -i{} git log {}~1..HEAD --name-only --pretty=format: | grep -Eo '[0-9]{2}_.*.pm$|*.json$' && git commit CHANGED ${CONTROLS_FILENAME} -m "Automaitc updated controls and CHANGED" || true
- name: git push
uses: ad-m/github-push-action@v0.6.0
uses: ad-m/github-push-action@v0.8.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: ${{ steps.extract_branch.outputs.branch }}
2 changes: 1 addition & 1 deletion controls_SD_TOOL.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
UPD 2023-02-01_14:11:22 286974 FHEM/88_SIGNALduino_TOOL.pm
UPD 2023-08-29_16:15:56 334743 FHEM/lib/SD_Device_ProtocolList.json
UPD 2023-08-29_16:05:51 334743 FHEM/lib/SD_Device_ProtocolList.json

0 comments on commit 147f75f

Please sign in to comment.