Merge pull request #44 from seehase/feature/github_actions

fix lable action
seehase · Jan 14, 2025 · 0ef219f · 0ef219f
2 parents aa73b35 + f4d4f70
commit 0ef219f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/merge-label.yml b/.github/workflows/merge-label.yml
@@ -17,7 +17,7 @@ jobs:
         run: |
           echo The PR was merged
           git checkout master
-          HEAD_VERSION=$( grep 'version = 1' skins/neowx-material/skin.conf | cut -d '"' -f 2  )
+          HEAD_VERSION=$( grep 'version = 1' skins/neowx-material/skin.conf | cut -d '"' -f 2 | xargs echo )
           echo "DIST_VERSION=${HEAD_VERSION}" >> $GITHUB_ENV     
           echo New label: $HEAD_VERSION
 

diff --git a/.github/workflows/pr-version-check.yml b/.github/workflows/pr-version-check.yml
@@ -18,11 +18,11 @@ jobs:
       - name: Version diff
         run: |
           # read version from file: ZonPHP/inc/version_info.php of head branch
-          HEAD_VERSION=$( grep 'version = 1' skins/neowx-material/skin.conf | cut -d '"' -f 2 )
+          HEAD_VERSION=$( grep 'version = 1' skins/neowx-material/skin.conf | cut -d '"' -f 2 | xargs echo )
           echo "HEAD_VERSION --> $HEAD_VERSION"
           git checkout master
           # read version from file: ZonPHP/inc/version_info.php of master branch
-          MASTER_VERSION=$( grep 'version = 1' skins/neowx-material/skin.conf | cut -d '"' -f 2 )
+          MASTER_VERSION=$( grep 'version = 1' skins/neowx-material/skin.conf | cut -d '"' -f 2 | xargs echo )
           echo "MASTER_VERSION --> $MASTER_VERSION"
           #if [ "$HEAD_VERSION" \> "$MASTER_VERSION" ]; then
           if [ "$(printf '%s\n' "$HEAD_VERSION" "$MASTER_VERSION" | sort -V | head -n 1)" != "$HEAD_VERSION" ]; then

diff --git a/skins/neowx-material/package.json b/skins/neowx-material/package.json
@@ -1,6 +1,6 @@
 {
   "name": "neowx-material",
-  "version": "1.35.2",
+  "version": "1.35.3",
   "description": "The most versatile and modern weewx skin",
   "main": "index.js",
   "repository": "https://github.com/neoground/neowx-material",

diff --git a/skins/neowx-material/skin.conf b/skins/neowx-material/skin.conf
@@ -40,7 +40,7 @@
     # This is the current version of this skin.
     # You can check for updates on the project page.
     #
-    version = 1.35.2
+    version = 1.35.3
 
     # Language
     # -------------------------------------------------------------------------