Skip to content

Commit

Permalink
Merge pull request #155 from fhem/sidey79/issue152
Browse files Browse the repository at this point in the history
update perl to 5.36.3 on bullseye image
  • Loading branch information
sidey79 authored Mar 9, 2024
2 parents 2b9a58b + b555882 commit 874129d
Show file tree
Hide file tree
Showing 11 changed files with 905 additions and 1,361 deletions.
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
src/FHEM/trunk
.github
.vscode
673 changes: 371 additions & 302 deletions .github/workflows/build.yml

Large diffs are not rendered by default.

84 changes: 42 additions & 42 deletions .github/workflows/prepare-svn/action.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
name: Reusable composit workflow which prepares svn
description: pull svn remote, extract svn ref and latest tag
outputs:
VARIANT_FHEM:
description: "Combined string, with FHEM Version and latest svn commit id"
value: ${{ steps.svnVars.outputs.VARIANT_FHEM }}
FHEM_REVISION_LATEST:
description: "The revision Number pulled from SVN"
value: ${{ steps.svnVars.outputs.FHEM_REVISION_LATEST }}


runs:
using: "composite"
steps:
- name: Get latest svn revision from remote server
shell: bash
id: svnRemote
run: echo "LAST_SVN_REVISION=$( svn info --show-item revision https://svn.fhem.de/fhem/trunk )" >> $GITHUB_OUTPUT

- name: Cache fhem
id: cache-fhem
uses: actions/cache@v4
with:
path: ./src/fhem/trunk
key: ${{ runner.os }}-fhemsvn-${{ steps.svnRemote.outputs.LAST_SVN_REVISION }}
restore-keys: |
${{ runner.os }}-fhemsvn-
- name: Update or checkout fhem from svn
shell: bash
if: steps.cache-fhem.outputs.cache-hit != 'true'
run: svn update ./src/fhem/trunk/ || svn co https://svn.fhem.de/fhem/trunk ./src/fhem/trunk;

- name: prepare svn vars
shell: bash
id: svnVars
working-directory: ./src/fhem/trunk
run: |
FHEM_REVISION_LATEST=$( svn info --show-item last-changed-revision)
FHEM_VERSION=$( svn ls "^/tags" https://svn.fhem.de/fhem/ | grep "FHEM_" | sort | tail -n 1 | cut -d / -f 1 | cut -d " " -f 1 |cut -d _ -f 2- | sed s/_/./g )
echo "VARIANT_FHEM=$(echo "${FHEM_VERSION}-s${FHEM_REVISION_LATEST}")" >> $GITHUB_OUTPUT
echo "FHEM_REVISION_LATEST=$(echo "$FHEM_REVISION_LATEST")" >> $GITHUB_OUTPUT
name: Reusable composit workflow which prepares svn
description: pull svn remote, extract svn ref and latest tag
outputs:
VARIANT_FHEM:
description: "Combined string, with FHEM Version and latest svn commit id"
value: ${{ steps.svnVars.outputs.VARIANT_FHEM }}
FHEM_REVISION_LATEST:
description: "The revision Number pulled from SVN"
value: ${{ steps.svnVars.outputs.FHEM_REVISION_LATEST }}


runs:
using: "composite"
steps:
- name: Get latest svn revision from remote server
shell: bash
id: svnRemote
run: echo "LAST_SVN_REVISION=$( svn info --show-item revision https://svn.fhem.de/fhem/trunk )" >> $GITHUB_OUTPUT

- name: Cache fhem
id: cache-fhem
uses: actions/cache@v4
with:
path: ./src/fhem/trunk
key: ${{ runner.os }}-fhemsvn-${{ steps.svnRemote.outputs.LAST_SVN_REVISION }}
restore-keys: |
${{ runner.os }}-fhemsvn-
- name: Update or checkout fhem from svn
shell: bash
if: steps.cache-fhem.outputs.cache-hit != 'true'
run: svn update ./src/fhem/trunk/ || svn co https://svn.fhem.de/fhem/trunk ./src/fhem/trunk;

- name: prepare svn vars
shell: bash
id: svnVars
working-directory: ./src/fhem/trunk
run: |
FHEM_REVISION_LATEST=$( svn info --show-item last-changed-revision)
FHEM_VERSION=$( svn ls "^/tags" https://svn.fhem.de/fhem/ | grep "FHEM_" | sort | tail -n 1 | cut -d / -f 1 | cut -d " " -f 1 |cut -d _ -f 2- | sed s/_/./g )
echo "VARIANT_FHEM=$(echo "${FHEM_VERSION}-s${FHEM_REVISION_LATEST}")" >> $GITHUB_OUTPUT
echo "FHEM_REVISION_LATEST=$(echo "$FHEM_REVISION_LATEST")" >> $GITHUB_OUTPUT
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ fhem/backup/*
fhem/cache/*
fhem/log/*
fhem/restoreDir/*
.vscode/*
src/FHEM/trunk/*
Loading

0 comments on commit 874129d

Please sign in to comment.