Merge branch 'master' into dependabot/github_actions/actions/configur…

…e-pages-5
fchastanet · Dec 13, 2024 · 0cf046e · 0cf046e
2 parents c9135dc + 3997f04
commit 0cf046e
Show file tree

Hide file tree

Showing 25 changed files with 31 additions and 30 deletions.
diff --git a/.bash-compiler b/.bash-compiler
@@ -1,2 +1,3 @@
 FRAMEWORK_ROOT_DIR=${ROOT_DIR}/vendor/bash-tools-framework
 BASH_TOOLS_ROOT_DIR=${ROOT_DIR}
+TEMPLATES_ROOT_DIR=${HOME}/fchastanet/bash-compiler/examples/templates
diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
@@ -74,7 +74,7 @@ jobs:
           git_user_signingkey: true
           git_commit_gpgsign: true
 
-      - uses: tibdex/github-app-token@v1
+      - uses: tibdex/github-app-token@v2
         if: ${{ success() }}
         id: generate-token
         with:
@@ -239,7 +239,7 @@ jobs:
           git_user_signingkey: true
           git_commit_gpgsign: true
 
-      - uses: tibdex/github-app-token@v1
+      - uses: tibdex/github-app-token@v2
         if: ${{ success() }}
         id: generate-token
         with:
@@ -292,7 +292,7 @@ jobs:
           exit "${status}"
 
       - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v4
+        uses: mikepenz/action-junit-report@v5
         if: ${{ always()}}
         with:
           token: ${{ github.token }}
@@ -303,7 +303,7 @@ jobs:
           report_paths: "logs/**.xml"
 
       - name: Checkstyle aggregation
-        uses: lcollins/checkstyle-github-action@v3.0.0
+        uses: lcollins/checkstyle-github-action@v3.1.0
         with:
           path: "logs/*.xml"
 

diff --git a/.github/workflows/precommit-autoupdate.yml b/.github/workflows/precommit-autoupdate.yml
@@ -30,7 +30,7 @@ jobs:
           git_user_signingkey: true
           git_commit_gpgsign: true
 
-      - uses: tibdex/github-app-token@v1
+      - uses: tibdex/github-app-token@v2
         id: generate-token
         with:
           app_id: ${{ secrets.APP_ID }}

diff --git a/.pre-commit-config-github.yaml b/.pre-commit-config-github.yaml
@@ -25,7 +25,7 @@ repos:
 
   - repo: https://github.com/executablebooks/mdformat
     # Do this before other tools "fixing" the line endings
-    rev: 0.7.17
+    rev: 0.7.19
     hooks:
       - id: mdformat
         name: Format Markdown
@@ -94,7 +94,7 @@ repos:
           )$
 
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.3
+    rev: v1.7.4
     hooks:
       - id: actionlint
         stages: [pre-commit, pre-push, manual]
@@ -210,6 +210,6 @@ repos:
         stages: [manual] # GITHUB
 
   - repo: https://github.com/fchastanet/bash-compiler
-    rev: v2.0.0
+    rev: v3.0.0
     hooks:
       - id: buildBashBinaries
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -20,7 +20,7 @@ repos:
 
   - repo: https://github.com/executablebooks/mdformat
     # Do this before other tools "fixing" the line endings
-    rev: 0.7.17
+    rev: 0.7.19
     hooks:
       - id: mdformat
         name: Format Markdown
@@ -89,7 +89,7 @@ repos:
           )$
 
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.3
+    rev: v1.7.4
     hooks:
       - id: actionlint
         stages: [pre-commit, pre-push, manual]
@@ -205,6 +205,6 @@ repos:
         stages: [] # GITHUB
 
   - repo: https://github.com/fchastanet/bash-compiler
-    rev: v2.0.0
+    rev: v3.0.0
     hooks:
       - id: buildBashBinaries
diff --git a/bin/cli b/bin/cli
@@ -353,7 +353,7 @@ Bash::handlePipelineFailure() {
 
 
 read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true
-#
+##!/usr/bin/env bash
 # shellcheck disable=SC2034
 
 # Default settings

diff --git a/bin/dbImport b/bin/dbImport
@@ -356,7 +356,7 @@ Bash::handlePipelineFailure() {
 
 
 read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true
-#
+##!/usr/bin/env bash
 # shellcheck disable=SC2034
 
 # Default settings

diff --git a/bin/dbImportProfile b/bin/dbImportProfile
@@ -356,7 +356,7 @@ Bash::handlePipelineFailure() {
 
 
 read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true
-#
+##!/usr/bin/env bash
 # shellcheck disable=SC2034
 
 # Default settings

diff --git a/bin/dbImportStream b/bin/dbImportStream
@@ -356,7 +356,7 @@ Bash::handlePipelineFailure() {
 
 
 read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true
-#
+##!/usr/bin/env bash
 # shellcheck disable=SC2034
 
 # Default settings

diff --git a/bin/dbQueryAllDatabases b/bin/dbQueryAllDatabases
@@ -339,7 +339,7 @@ Bash::handlePipelineFailure() {
 
 
 read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true
-#
+##!/usr/bin/env bash
 # shellcheck disable=SC2034
 
 # Default settings

diff --git a/bin/dbScriptAllDatabases b/bin/dbScriptAllDatabases
@@ -339,7 +339,7 @@ Bash::handlePipelineFailure() {
 
 
 read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true
-#
+##!/usr/bin/env bash
 # shellcheck disable=SC2034
 
 # Default settings

diff --git a/bin/doc b/bin/doc
@@ -308,7 +308,7 @@ Assert::tty() {
 
 
 read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true
-#
+##!/usr/bin/env bash
 # shellcheck disable=SC2034
 
 # Default settings

diff --git a/bin/gitIsAncestorOf b/bin/gitIsAncestorOf
@@ -339,7 +339,7 @@ Bash::handlePipelineFailure() {
 
 
 read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true
-#
+##!/usr/bin/env bash
 # shellcheck disable=SC2034
 
 # Default settings

diff --git a/bin/gitIsBranch b/bin/gitIsBranch
@@ -339,7 +339,7 @@ Bash::handlePipelineFailure() {
 
 
 read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true
-#
+##!/usr/bin/env bash
 # shellcheck disable=SC2034
 
 # Default settings

diff --git a/bin/gitRenameBranch b/bin/gitRenameBranch
@@ -339,7 +339,7 @@ Bash::handlePipelineFailure() {
 
 
 read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true
-#
+##!/usr/bin/env bash
 # shellcheck disable=SC2034
 
 # Default settings

diff --git a/bin/installRequirements b/bin/installRequirements
@@ -308,7 +308,7 @@ Assert::tty() {
 
 
 read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true
-#
+##!/usr/bin/env bash
 # shellcheck disable=SC2034
 
 # Default settings

diff --git a/bin/mysql2puml b/bin/mysql2puml
@@ -325,7 +325,7 @@ Assert::tty() {
 
 
 read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true
-#
+##!/usr/bin/env bash
 # shellcheck disable=SC2034
 
 # Default settings

diff --git a/bin/postmanCli b/bin/postmanCli
@@ -356,7 +356,7 @@ Bash::handlePipelineFailure() {
 
 
 read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true
-#
+##!/usr/bin/env bash
 # shellcheck disable=SC2034
 
 # Default settings

diff --git a/bin/upgradeGithubRelease b/bin/upgradeGithubRelease
@@ -381,7 +381,7 @@ Bash::handlePipelineFailure() {
 
 
 read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true
-#
+##!/usr/bin/env bash
 # shellcheck disable=SC2034
 
 # Default settings

diff --git a/bin/waitForIt b/bin/waitForIt
@@ -356,7 +356,7 @@ Bash::handlePipelineFailure() {
 
 
 read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true
-#
+##!/usr/bin/env bash
 # shellcheck disable=SC2034
 
 # Default settings

diff --git a/bin/waitForMysql b/bin/waitForMysql
@@ -339,7 +339,7 @@ Bash::handlePipelineFailure() {
 
 
 read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true
-#
+##!/usr/bin/env bash
 # shellcheck disable=SC2034
 
 # Default settings

diff --git a/conf/dbScripts/extractData b/conf/dbScripts/extractData
@@ -350,7 +350,7 @@ Bash::handlePipelineFailure() {
 
 
 read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true
-#
+##!/usr/bin/env bash
 # shellcheck disable=SC2034
 
 # Default settings

diff --git a/install b/install
@@ -356,7 +356,7 @@ Backup::dir() {
 
 
 read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true
-#
+##!/usr/bin/env bash
 # shellcheck disable=SC2034
 
 # Default settings

diff --git a/src/BashTools/Conf/requireLoad.sh b/src/BashTools/Conf/requireLoad.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true
-#{{ include ".env" .Data . -}}
+#{{ includeFile "${BASH_TOOLS_ROOT_DIR}/conf/defaultEnv/.env"  -}}
 EOM
 
 # @description loads ~/.bash-tools/.env if available

diff --git a/src/_binaries/Converters/mysql2puml/testsData/mysql2puml.png b/src/_binaries/Converters/mysql2puml/testsData/mysql2puml.png