Merge pull request #421 from vscheuber/main

pipeline hygiene
rockcarver · Jun 21, 2024 · 15ac2bc · 15ac2bc
2 parents 659281e + b7f7f62
commit 15ac2bc
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -39,6 +39,9 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'
 
+      - name: Update package-log.json before version bump
+        run: npm i --package-lock-only
+
       - name: Install dependencies
         run: npm ci
 
@@ -60,7 +63,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Update package-log.json
+      - name: Update package-log.json after version bump
         run: npm i --package-lock-only
 
       - name: Version From Tag
@@ -234,7 +237,7 @@ jobs:
         run: echo ${{ github.sha }} > Release.txt
 
       - name: Update Changelog
-        uses: thomaseizinger/keep-a-changelog-new-release@v2
+        uses: thomaseizinger/keep-a-changelog-new-release@v3
         with:
           tag: ${{ needs.build.outputs.newTag }}
 
@@ -260,7 +263,7 @@ jobs:
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git add CHANGELOG.md package.json docs
+          git add CHANGELOG.md package.json package-lock.json docs
           git commit --message "Updated changelog, version, and docs for release ${{ needs.build.outputs.newTag }}"
           git push
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,8 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+-   Pipeline hygene
+
 ## [2.0.0-87] - 2024-06-20
 
+### Changed
+
+-   \#417: Added support for node 22
+-   \#363: Updated information in README
+
 ## [2.0.0-86] - 2024-06-19
 
 ### Changed

diff --git a/src/ops/cloud/StartupOps.ts b/src/ops/cloud/StartupOps.ts
@@ -210,8 +210,9 @@ export async function applyUpdates({
   } catch (error) {
     stopProgressIndicator({
       id: indicatorId,
-      message: `Error: ${error.response?.data?.code || error} - ${error.response
-        ?.data?.message}`,
+      message: `Error: ${error.response?.data?.code || error} - ${
+        error.response?.data?.message
+      }`,
       status: 'fail',
       state,
     });

diff --git a/src/utils/ExportImportUtils.ts b/src/utils/ExportImportUtils.ts
@@ -567,7 +567,8 @@ export function parseUrl(href: string): any {
     r.origin = r.protocol + '//' + r.host;
   }
   if (r.search.length > 2) {
-    const query = r.search.indexOf('?') === 0 ? r.search.substr(1) : r.search;
+    const query =
+      r.search.indexOf('?') === 0 ? r.search.substring(1) : r.search;
     const vars = query.split('&');
     for (let i = 0; i < vars.length; i++) {
       const pair = vars[i].split('=');