Merge branch 'master' into feature/202403_GetFileNameRegex_longer

qdraw · Apr 8, 2024 · b8c6345 · b8c6345
2 parents aa1e9da + 77fedf8
commit b8c6345
Show file tree

Hide file tree

Showing 31 changed files with 876 additions and 849 deletions.
diff --git a/.github/workflows/documentation-gh-pages.yml b/.github/workflows/documentation-gh-pages.yml
@@ -56,7 +56,7 @@ jobs:
           npm run build
 
       - name: Setup Pages
-        uses: actions/configure-pages@v4
+        uses: actions/configure-pages@v5
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3

diff --git a/.github/workflows/end2end-ubuntu-ci.yml b/.github/workflows/end2end-ubuntu-ci.yml
@@ -2,7 +2,12 @@ on:
   workflow_dispatch:
   schedule:
     - cron:  '45 0 * * *'
-
+  pull_request:
+    branches: [ master ]
+    paths:
+    - 'starsky-tools/end2end/**'
+    - '.github/workflows/end2end-ubuntu-ci.yml'
+
 name: end2end on ubuntu-ci
 
 jobs:

diff --git a/.github/workflows/end2end-windows-ci.yml b/.github/workflows/end2end-windows-ci.yml
@@ -6,6 +6,11 @@ on:
     branches: [ master ]
     paths:
     - '.github/workflows/end2end-windows-ci.yml'
+  pull_request:
+    branches: [ master ]
+    paths:
+    - 'starsky-tools/end2end/**'
+    - '.github/workflows/end2end-windows-ci.yml'
 
 name: end2end on windows-ci
 

diff --git a/documentation/package-lock.json b/documentation/package-lock.json
diff --git a/documentation/package.json b/documentation/package.json
@@ -19,7 +19,8 @@
     "write-heading-ids": "docusaurus write-heading-ids",
     "typecheck": "tsc",
     "update": "node ../starsky-tools/build-tools/documentation-create-docusaurus-update.js",
-    "update:install": "npm run update"
+    "update:install": "npm run update",
+    "update:yes": "npm run update"
   },
   "dependencies": {
     "@cmfcmf/docusaurus-search-local": "^1.1.0",

diff --git a/pipelines/azure/develop-ci.yml b/pipelines/azure/develop-ci.yml
@@ -58,7 +58,7 @@ stages:
   jobs:
   - job: buildnetcore
     displayName: 'Build'
-    timeoutInMinutes: 25 # how long to run the job before automatically cancelling
+    timeoutInMinutes: 30 # how long to run the job before automatically cancelling
     cancelTimeoutInMinutes: 10 # how much time to give 'run always even if cancelled tasks' before stopping them
     pool:
       vmImage: 'ubuntu-22.04'

diff --git a/starsky-tools/dropbox-import/package-lock.json b/starsky-tools/dropbox-import/package-lock.json
diff --git a/starsky-tools/dropbox-import/package.json b/starsky-tools/dropbox-import/package.json
@@ -10,7 +10,7 @@
     "update:install": "npx  --yes npm-check-updates -u && npm install"
   },
   "dependencies": {
-    "axios": "^1.6.7",
+    "axios": "^1.6.8",
     "dotenv": "^16.4.5"
   },
   "author": "",