From 5b8b0c19da9988a553622067bbfe7edf0aed82ee Mon Sep 17 00:00:00 2001 From: LukeGus Date: Thu, 28 Nov 2024 01:24:17 +0000 Subject: [PATCH 1/9] Commit --- git_push.sh | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100755 git_push.sh diff --git a/git_push.sh b/git_push.sh new file mode 100755 index 00000000..c723a636 --- /dev/null +++ b/git_push.sh @@ -0,0 +1,54 @@ +#!/bin/bash + +# Check if the correct number of parameters is provided +if [ "$#" -ne 2 ]; then + echo "Usage: $0 " + exit 1 +fi + +# Assign parameters to variables +COMMIT_MESSAGE=$1 +BRANCH_NAME=$2 + +# Check if the branch exists +BRANCH_EXISTS=$(git branch --list "$BRANCH_NAME") + +if [ -z "$BRANCH_EXISTS" ]; then + echo "Branch '$BRANCH_NAME' does not exist. Creating it now..." + git checkout -b "$BRANCH_NAME" + if [ $? -ne 0 ]; then + echo "Failed to create branch '$BRANCH_NAME'." + exit 1 + fi +else + echo "Branch '$BRANCH_NAME' exists. Checking it out..." + git checkout "$BRANCH_NAME" + if [ $? -ne 0 ]; then + echo "Failed to checkout branch '$BRANCH_NAME'." + exit 1 + fi +fi + +# Perform git operations +echo "Adding all changes..." +git add . +if [ $? -ne 0 ]; then + echo "Failed to add changes." + exit 1 +fi + +echo "Committing changes with message: $COMMIT_MESSAGE" +git commit -m "$COMMIT_MESSAGE" +if [ $? -ne 0 ]; then + echo "Commit failed." + exit 1 +fi + +echo "Pushing changes forcefully to branch: $BRANCH_NAME" +git push -f origin "$BRANCH_NAME" +if [ $? -ne 0 ]; then + echo "Push failed." + exit 1 +fi + +echo "Git operations completed successfully." -- 2.49.1 From 7f835c5f2568a09e2a7775210507644db43a9951 Mon Sep 17 00:00:00 2001 From: LukeGus Date: Thu, 28 Nov 2024 01:25:07 +0000 Subject: [PATCH 2/9] Commit --- git_push.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git_push.sh b/git_push.sh index c723a636..27876bbf 100755 --- a/git_push.sh +++ b/git_push.sh @@ -51,4 +51,4 @@ if [ $? -ne 0 ]; then exit 1 fi -echo "Git operations completed successfully." +echo "Git operations completed successfully." \ No newline at end of file -- 2.49.1 From 4e6f048d6d88e8e7435708b82054d786bf25884e Mon Sep 17 00:00:00 2001 From: LukeGus Date: Thu, 28 Nov 2024 01:26:47 +0000 Subject: [PATCH 3/9] Commit --- git_push.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/git_push.sh b/git_push.sh index 27876bbf..891812bf 100755 --- a/git_push.sh +++ b/git_push.sh @@ -29,6 +29,12 @@ else fi fi +# Check if there are any changes to commit +if git diff --quiet; then + echo "No changes to commit." + exit 0 +fi + # Perform git operations echo "Adding all changes..." git add . -- 2.49.1 From 0d9c219ea4cf4678af9043748719389cf15099b1 Mon Sep 17 00:00:00 2001 From: LukeGus Date: Thu, 28 Nov 2024 01:31:14 +0000 Subject: [PATCH 4/9] Commit --- .gitconfig | 2 ++ .github/workflows/docker-image.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .gitconfig diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 00000000..98a080be --- /dev/null +++ b/.gitconfig @@ -0,0 +1,2 @@ +[credential] + helper = store diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index bda9561d..fc632c29 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -3,7 +3,7 @@ name: Build and Push Docker Image on: push: branches: - - main + - testing workflow_dispatch: inputs: tag_name: -- 2.49.1 From 06a0884cff52b880e1f2bf9bf87256ae7baedadb Mon Sep 17 00:00:00 2001 From: LukeGus Date: Thu, 28 Nov 2024 01:33:25 +0000 Subject: [PATCH 5/9] Commit --- .github/workflows/docker-image.yml | 3 +++ .gitignore | 1 + 2 files changed, 4 insertions(+) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index fc632c29..cdac174f 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -4,6 +4,9 @@ on: push: branches: - testing + - pre-release + - alpha + - beta workflow_dispatch: inputs: tag_name: diff --git a/.gitignore b/.gitignore index b2326cf2..7b702ae0 100644 --- a/.gitignore +++ b/.gitignore @@ -132,6 +132,7 @@ yarn-error.log* .profile .sudo_as_admin_successful .wget-hsts +.git-credentials # VSCode Files .vscode-server/ -- 2.49.1 From 80c49d15109fc60860ec063b17bcd2da35cc2860 Mon Sep 17 00:00:00 2001 From: LukeGus Date: Thu, 28 Nov 2024 01:34:32 +0000 Subject: [PATCH 6/9] Commit --- git_push.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/git_push.sh b/git_push.sh index 891812bf..00184f6b 100755 --- a/git_push.sh +++ b/git_push.sh @@ -10,6 +10,9 @@ fi COMMIT_MESSAGE=$1 BRANCH_NAME=$2 +# Ensure Git is using the credential helper for HTTPS +git config --global credential.helper store + # Check if the branch exists BRANCH_EXISTS=$(git branch --list "$BRANCH_NAME") @@ -51,6 +54,8 @@ if [ $? -ne 0 ]; then fi echo "Pushing changes forcefully to branch: $BRANCH_NAME" +# Set GIT_ASKPASS to bypass the password prompt using the stored credentials +export GIT_ASKPASS=echo git push -f origin "$BRANCH_NAME" if [ $? -ne 0 ]; then echo "Push failed." -- 2.49.1 From b66976a73290babf92b85e3861ebdf0936492ddf Mon Sep 17 00:00:00 2001 From: LukeGus Date: Thu, 28 Nov 2024 01:38:44 +0000 Subject: [PATCH 7/9] Commit --- git_push.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/git_push.sh b/git_push.sh index 00184f6b..de2a7154 100755 --- a/git_push.sh +++ b/git_push.sh @@ -54,7 +54,6 @@ if [ $? -ne 0 ]; then fi echo "Pushing changes forcefully to branch: $BRANCH_NAME" -# Set GIT_ASKPASS to bypass the password prompt using the stored credentials export GIT_ASKPASS=echo git push -f origin "$BRANCH_NAME" if [ $? -ne 0 ]; then -- 2.49.1 From 4f1510c0dac3019a4861a664d2fa4fd25e0260c2 Mon Sep 17 00:00:00 2001 From: LukeGus Date: Thu, 28 Nov 2024 01:41:26 +0000 Subject: [PATCH 8/9] Commit --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 3b848103..e4790c3c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -22,8 +22,8 @@ COPY --from=frontend-build /app/frontend/dist /usr/share/nginx/html COPY --from=backend-build /backend /backend COPY --from=backend-build /backend/entrypoint.sh /backend/entrypoint.sh +# Configure start-up RUN chmod +x /backend/entrypoint.sh - ENTRYPOINT ["/backend/entrypoint.sh"] EXPOSE 80 -- 2.49.1 From effd679a003b25186c2fbfd3178ee860a23f77e3 Mon Sep 17 00:00:00 2001 From: LukeGus Date: Thu, 28 Nov 2024 04:51:57 +0000 Subject: [PATCH 9/9] Commit --- frontend/src/App.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index ea125789..b786bef6 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -23,7 +23,7 @@ const App = () => { terminal.current.open(terminalRef.current); // Connect to the WebSocket server - socket.current = new WebSocket('2.tcp.ngrok.io:10908'); + socket.current = new WebSocket('localhost:3001'); // WebSocket Event Handlers socket.current.onopen = () => { -- 2.49.1