From 25718147a9dcc6521b497716cdb513ff3a69cd3f Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Sat, 13 Apr 2024 04:08:29 -0600 Subject: [PATCH 1/8] Fixed --- .github/workflows/fullBuild.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fullBuild.yml b/.github/workflows/fullBuild.yml index 828ac83..ee79c56 100644 --- a/.github/workflows/fullBuild.yml +++ b/.github/workflows/fullBuild.yml @@ -1,5 +1,9 @@ name: Build and Push To Full Build branch -on: [push, workflow_dispatch] +on: + push: + branches: + - main + workflow_dispatch: jobs: build: name: Build and Push To Full Build branch @@ -24,7 +28,7 @@ jobs: with: ruby-version: '3.2.2' - name: Install other things - run: apt-get install -y build-essential libpq-dev + run: sudo apt update && sudo apt install -y build-essential libpq-dev - name: Install PNPM run: npm install -g pnpm - name: Install From 7372461234d589d904433497485530cc4d73f3d8 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Sat, 13 Apr 2024 04:09:34 -0600 Subject: [PATCH 2/8] Fixed --- .github/workflows/fullBuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fullBuild.yml b/.github/workflows/fullBuild.yml index ee79c56..7164951 100644 --- a/.github/workflows/fullBuild.yml +++ b/.github/workflows/fullBuild.yml @@ -15,10 +15,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + with: + ref: full-build - name: Submodule Update run: git submodule update --init --recursive - - name: Checkout Full Build Branch - run: git checkout full-build - name: Setup Node uses: actions/setup-node@v3 with: From 7d480434ea90b91c623598b2383fc74d0112c235 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Sat, 13 Apr 2024 04:14:08 -0600 Subject: [PATCH 3/8] Lets see if this works --- .github/workflows/fullBuild.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/fullBuild.yml b/.github/workflows/fullBuild.yml index 7164951..0a38cf1 100644 --- a/.github/workflows/fullBuild.yml +++ b/.github/workflows/fullBuild.yml @@ -39,8 +39,8 @@ jobs: make - name: Commit to branch run: | - git config --global user.email "actions@github.com" - git config --global user.name "GitHub Actions" + git config user.name github-actions + git config user.email github-actions@github.com git add . - git commit -m "Build" - git push origin full-build + git commit -m "Build from Github Actions" + git push From 4b97537eb213fd075cd3a25b8bcac8516b0684e9 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Sat, 13 Apr 2024 04:19:19 -0600 Subject: [PATCH 4/8] More console.log --- src/public/js/updates.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/public/js/updates.js b/src/public/js/updates.js index 6f9defa..70b0270 100644 --- a/src/public/js/updates.js +++ b/src/public/js/updates.js @@ -5,6 +5,7 @@ function getLatestRelease() { if (userVersion != data.version || userVersion == null || userVersion == undefined) { localStorage.setItem('updated', true); localStorage.setItem('version', data.version); + console.log("Updated to version " + data.version); } }); } From d22801316c93e1b01142f08a6d3df414c369fe5b Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Sat, 13 Apr 2024 04:23:27 -0600 Subject: [PATCH 5/8] hmmm --- .github/workflows/fullBuild.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fullBuild.yml b/.github/workflows/fullBuild.yml index 0a38cf1..e615090 100644 --- a/.github/workflows/fullBuild.yml +++ b/.github/workflows/fullBuild.yml @@ -13,7 +13,16 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'Ruby-Network' steps: - - name: Checkout + - name: Checkout (main) + uses: actions/checkout@v3 + - name: Submodule Update + run: git submodule update --init --recursive + - name: Push to full-build branch + run: | + git config user.name github-actions + git config user.email + git push origin HEAD:full-build + - name: Checkout (full-build branch) uses: actions/checkout@v3 with: ref: full-build From e1cc7195075d4da6723b441a94178d38fd752ec5 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Sat, 13 Apr 2024 04:24:27 -0600 Subject: [PATCH 6/8] hmmm --- .github/workflows/fullBuild.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fullBuild.yml b/.github/workflows/fullBuild.yml index e615090..2732338 100644 --- a/.github/workflows/fullBuild.yml +++ b/.github/workflows/fullBuild.yml @@ -21,7 +21,10 @@ jobs: run: | git config user.name github-actions git config user.email - git push origin HEAD:full-build + git checkout -b full-build + git add . + git commit -m "Full Build (from main)" + git push origin full-build - name: Checkout (full-build branch) uses: actions/checkout@v3 with: From 3c0fc3fbbbdefcce188bec5a4dad33c227e421f6 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Sat, 13 Apr 2024 04:26:05 -0600 Subject: [PATCH 7/8] hmmm --- .github/workflows/fullBuild.yml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/.github/workflows/fullBuild.yml b/.github/workflows/fullBuild.yml index 2732338..07f9c0e 100644 --- a/.github/workflows/fullBuild.yml +++ b/.github/workflows/fullBuild.yml @@ -13,24 +13,14 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'Ruby-Network' steps: - - name: Checkout (main) - uses: actions/checkout@v3 - - name: Submodule Update - run: git submodule update --init --recursive - - name: Push to full-build branch - run: | - git config user.name github-actions - git config user.email - git checkout -b full-build - git add . - git commit -m "Full Build (from main)" - git push origin full-build - - name: Checkout (full-build branch) + - name: Checkout uses: actions/checkout@v3 with: ref: full-build - name: Submodule Update run: git submodule update --init --recursive + - name: Pull changes from main + run: git pull origin main --rebase - name: Setup Node uses: actions/setup-node@v3 with: From b56dbbe8c41c57d1c93951d678e3024e256a8995 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Sat, 13 Apr 2024 04:28:06 -0600 Subject: [PATCH 8/8] hmmm --- .github/workflows/fullBuild.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/fullBuild.yml b/.github/workflows/fullBuild.yml index 07f9c0e..1d20917 100644 --- a/.github/workflows/fullBuild.yml +++ b/.github/workflows/fullBuild.yml @@ -2,7 +2,7 @@ name: Build and Push To Full Build branch on: push: branches: - - main + - full-build workflow_dispatch: jobs: build: @@ -19,8 +19,6 @@ jobs: ref: full-build - name: Submodule Update run: git submodule update --init --recursive - - name: Pull changes from main - run: git pull origin main --rebase - name: Setup Node uses: actions/setup-node@v3 with: