Merge pull request #135 from christian1980nrw/dev

merge fixes
christian1980nrw · Oct 25, 2023 · bca4875 · bca4875
2 parents 7bb56a9 + 3b3982b
commit bca4875
Show file tree

Hide file tree

Showing 5 changed files with 289 additions and 190 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,6 +6,9 @@ jobs:
   yamllint:
     runs-on: ubuntu-latest
     steps:
+      - name: Set BRANCH_NAME from github.ref
+        id: extract_branch
+        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/} | sed 's/refs\/pull\/.*\///' | sed 's/\/merge//')"
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Install yamllint
@@ -81,7 +84,8 @@ jobs:
         env:
           DEBUG: 1
           DESTDIR: /tmp/testing
-          BRANCH: ${{ steps.set-branch-name.outputs.branch_name }}
+          BRANCH: ${{ steps.extract_branch.outputs.branch }}
+          ACTOR: ${{ github.actor }}
       - name: Execute Run-Script
         run: /tmp/testing//data/etc/Spotmarket-Switcher/service/run
         env:

diff --git a/.github/workflows/venus.yml b/.github/workflows/venus.yml
@@ -10,6 +10,9 @@ jobs:
       image: victronenergy/venus-docker
       options: --cpus 1
     steps:
+      - name: Set branch name
+        id: set_branch
+        run: echo "BRANCH_NAME=${GITHUB_HEAD_REF}" >> $GITHUB_ENV
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Check for dockerenv file
@@ -29,14 +32,13 @@ jobs:
           fi
       - name: Set script permissions
         run: chmod +x ./victron-venus-os-install.sh
-        env:
-          DEBUG: 1
       - name: Execute Installation under Venus OS
         run: |
           echo pwd
           pwd
           echo ls
           ls
+          echo "BRANCH = ${{ env.BRANCH_NAME }}"
           echo victron-venus-os-install.sh
           if ./victron-venus-os-install.sh ; then
              echo "[OK]"
@@ -50,6 +52,8 @@ jobs:
         env:
           NO_REBOOT: 1
           DEBUG: 1
+          BRANCH: ${{ env.BRANCH_NAME }}
+          ACTOR: ${{ github.actor }}
       - name: Execute Run-Script under Venus OS
         run: /data/etc/Spotmarket-Switcher/service/run
         env: