From 7e9fcdaa213768ec4b7354f3405fba8da1e977e5 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sun, 15 Sep 2024 14:29:54 +0300
Subject: [PATCH 1/4] Add contributors workflow
---
.github/workflows/contributors.yml | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 .github/workflows/contributors.yml
diff --git a/.github/workflows/contributors.yml b/.github/workflows/contributors.yml
new file mode 100644
index 000000000..f3dc95650
--- /dev/null
+++ b/.github/workflows/contributors.yml
@@ -0,0 +1,13 @@
+name: Contributors
+on: workflow_dispatch
+jobs:
+ contributors:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: wow-actions/contributors-list@v1
+ with:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ svgPath: .github/CONTRIBUTORS.svg
+ round: true
+ count: 20
+ includeBots: false
From 82da4598ca9bea1fbd166c521a1559e182a66c29 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 15 Sep 2024 11:31:26 +0000
Subject: [PATCH 2/4] chore: update contributors [skip ci]
---
.github/CONTRIBUTORS.svg | 63 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 63 insertions(+)
create mode 100644 .github/CONTRIBUTORS.svg
diff --git a/.github/CONTRIBUTORS.svg b/.github/CONTRIBUTORS.svg
new file mode 100644
index 000000000..79361a7a4
--- /dev/null
+++ b/.github/CONTRIBUTORS.svg
@@ -0,0 +1,63 @@
+
\ No newline at end of file
From 64e38eb8d1e939b938ae1d844f988fce017a6b12 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sun, 15 Sep 2024 15:18:00 +0300
Subject: [PATCH 3/4] Remove contributors workflow
---
.github/CONTRIBUTORS.svg | 63 ------------------------------
.github/workflows/contributors.yml | 13 ------
2 files changed, 76 deletions(-)
delete mode 100644 .github/CONTRIBUTORS.svg
delete mode 100644 .github/workflows/contributors.yml
diff --git a/.github/CONTRIBUTORS.svg b/.github/CONTRIBUTORS.svg
deleted file mode 100644
index 79361a7a4..000000000
--- a/.github/CONTRIBUTORS.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-
\ No newline at end of file
diff --git a/.github/workflows/contributors.yml b/.github/workflows/contributors.yml
deleted file mode 100644
index f3dc95650..000000000
--- a/.github/workflows/contributors.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: Contributors
-on: workflow_dispatch
-jobs:
- contributors:
- runs-on: ubuntu-latest
- steps:
- - uses: wow-actions/contributors-list@v1
- with:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- svgPath: .github/CONTRIBUTORS.svg
- round: true
- count: 20
- includeBots: false
From 15363a8d69cf83d84d8cb2e5f1c70216353f7782 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Thu, 19 Sep 2024 15:42:07 +0000
Subject: [PATCH 4/4] Silence deprecation warnings in default startup scripts
Closes #2876
---
Dockerfile | 2 +-
Start.bat | 2 +-
UpdateAndStart.bat | 2 +-
UpdateForkAndStart.bat | 4 ++--
start.sh | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 64a92173a..30617c02e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ ENV NODE_ENV=production
COPY package*.json post-install.js ./
RUN \
echo "*** Install npm packages ***" && \
- npm i --no-audit --no-fund --quiet --omit=dev && npm cache clean --force
+ npm i --no-audit --no-fund --loglevel=error --no-progress --omit=dev && npm cache clean --force
# Bundle app source
COPY . ./
diff --git a/Start.bat b/Start.bat
index 8d1bfcdd7..148cda253 100644
--- a/Start.bat
+++ b/Start.bat
@@ -1,7 +1,7 @@
@echo off
pushd %~dp0
set NODE_ENV=production
-call npm install --no-audit --no-fund --quiet --omit=dev
+call npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev
node server.js %*
pause
popd
diff --git a/UpdateAndStart.bat b/UpdateAndStart.bat
index 110122cf2..55cee5ce9 100644
--- a/UpdateAndStart.bat
+++ b/UpdateAndStart.bat
@@ -12,7 +12,7 @@ if %errorlevel% neq 0 (
)
)
set NODE_ENV=production
-call npm install --no-audit --no-fund --quiet --omit=dev
+call npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev
node server.js %*
pause
popd
diff --git a/UpdateForkAndStart.bat b/UpdateForkAndStart.bat
index 5052b9aa0..8bfae8609 100644
--- a/UpdateForkAndStart.bat
+++ b/UpdateForkAndStart.bat
@@ -42,7 +42,7 @@ if NOT "!AUTO_SWITCH!"=="" (
SET TARGET_BRANCH=release
goto update
)
-
+
echo Auto-switching defined to stay on current branch
goto update
)
@@ -95,7 +95,7 @@ if %errorlevel% neq 0 (
echo Installing npm packages and starting server
set NODE_ENV=production
-call npm install --no-audit --no-fund --quiet --omit=dev
+call npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev
node server.js %*
:end
diff --git a/start.sh b/start.sh
index 9fbf8c7d7..d9a14e298 100755
--- a/start.sh
+++ b/start.sh
@@ -26,7 +26,7 @@ fi
echo "Installing Node Modules..."
export NODE_ENV=production
-npm i --no-audit --no-fund --quiet --omit=dev
+npm i --no-audit --no-fund --loglevel=error --no-progress --omit=dev
echo "Entering SillyTavern..."
node "server.js" "$@"