Merge branch 'release/1.0.4'

brdgm · Aug 19, 2023 · 77b4bd1 · 77b4bd1
2 parents 4822884 + 8b6b1f1
commit 77b4bd1
Show file tree

Hide file tree

Showing 11 changed files with 2,390 additions and 1,727 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,6 +22,12 @@ jobs:
       with:
         fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
+    - name: Read properties from package.json
+      id: package_json
+      uses: zoexx/github-action-json-file-properties@1.0.4
+      with:
+        file_path: package.json
+
     - uses: actions/setup-node@v3
       with:
         node-version: 18
@@ -36,3 +42,5 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{ env.SONARCLOUD_TOKEN }}
+      with:
+        args: -Dsonar.projectVersion=${{steps.package_json.outputs.version}}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -11,11 +11,17 @@ jobs:
     runs-on: ubuntu-latest
     environment:
       name: Production
-      url: "https://brdgm.me/${{ vars.APP_NAME }}"
+      url: "https://brdgm.me/${{ steps.package_json.outputs.appDeployName }}"
 
     steps:
     - uses: actions/checkout@v3
 
+    - name: Read properties from package.json
+      id: package_json
+      uses: zoexx/github-action-json-file-properties@1.0.4
+      with:
+        file_path: package.json
+
     - uses: actions/setup-node@v3
       with:
         node-version: 18
@@ -37,5 +43,5 @@ jobs:
         user-email: ${{ secrets.GH_SITE_DEPLOY_EMAIL }}
         user-name: ${{ secrets.GH_SITE_DEPLOY_NAME }}
         target-branch: main
-        commit-message: deploy ${{ vars.APP_NAME }}
-        target-directory: ${{ vars.APP_NAME }}
+        commit-message: deploy ${{ steps.package_json.outputs.appDeployName }} ${{ steps.package_json.outputs.version }}
+        target-directory: ${{ steps.package_json.outputs.appDeployName }}
diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 # Autobahn Solo Helper
 
+[![Build](https://github.com/brdgm/autobahn-solo-helper/workflows/Build/badge.svg?branch=develop)](https://github.com/brdgm/autobahn-solo-helper/actions?query=workflow%3ABuild+branch%3Adevelop)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=brdgm_autobahn-solo-helper&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=brdgm_autobahn-solo-helper)
 
 
@@ -20,7 +21,7 @@ npm install
 
 ### Compiles and hot-reloads for development
 ```
-npm run serve
+npm run dev
 ```
 
 ### Compiles and minifies for production