From 0bd579614a3653375b0fd1551fc5c22a177b53cf Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Fri, 3 Nov 2023 23:15:37 -0700 Subject: [PATCH 01/26] eslint fix for vm --- .eslintrc.js | 1 + 1 file changed, 1 insertion(+) diff --git a/.eslintrc.js b/.eslintrc.js index 515df2a..77c5405 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -15,6 +15,7 @@ module.exports = { 'react', ], rules: { + 'jsx-a11y/control-has-associated-label': 'off', 'react/jsx-filename-extension': [1, { extensions: ['.js', '.jsx'] }], 'react/forbid-prop-types': [0, {}], 'import/no-extraneous-dependencies': ['error', { devDependencies: true }], From d494ad53b7b09b8624d42503dcd45c8b948ac24c Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 00:29:58 -0700 Subject: [PATCH 02/26] created deploy gitaction --- .github/workflows/deploy-gitworker.yml | 29 ++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/deploy-gitworker.yml diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml new file mode 100644 index 0000000..b7b6ebb --- /dev/null +++ b/.github/workflows/deploy-gitworker.yml @@ -0,0 +1,29 @@ +name: Build and Deploy to Azure VM + +on: + push: + branches: + - feature/gitworkflow + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Install Node.js and dependencies + uses: actions/setup-node@v2 + with: + node-version: '19.0.1' + + deploy: + needs: build + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Deploy to VM + run: + echo "Deploying built code to VM..." \ No newline at end of file From 5e43efc90a6b1ae3d629772c3b6342430230e9d9 Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 09:13:11 -0700 Subject: [PATCH 03/26] commit test --- src/Pages/LoginPage/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/LoginPage/index.js b/src/Pages/LoginPage/index.js index 20359b2..421ed5e 100644 --- a/src/Pages/LoginPage/index.js +++ b/src/Pages/LoginPage/index.js @@ -60,7 +60,7 @@ export default function LoginPage() { -

BANANA PORTAL

+

BRENDAN PORTAL

From ec716a3a1788046aab7854d8d99bb2a898c21754 Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 11:01:18 -0700 Subject: [PATCH 04/26] ssh access to vm --- .github/workflows/deploy-gitworker.yml | 32 +++++++++++++++++++++----- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index b7b6ebb..f35fd32 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -1,4 +1,4 @@ -name: Build and Deploy to Azure VM +name: Build and Deploy to VM on: push: @@ -7,7 +7,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout code uses: actions/checkout@v2 @@ -19,11 +19,31 @@ jobs: deploy: needs: build - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout code uses: actions/checkout@v2 - - name: Deploy to VM - run: - echo "Deploying built code to VM..." \ No newline at end of file + - name: Set up SSH key + run: | + mkdir -p ~/.ssh + echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + ssh-keyscan -t rsa $VM_IP >> ~/.ssh/known_hosts + env: + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + VM_IP: ${{ secrets.VM_IP }} + + - name: Access VM and Check Nginx Status + run: | + ssh $VM_USERNAME@$VM_IP "systemctl status nginx" + env: + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + VM_IP: ${{ secrets.VM_IP }} + VM_USERNAME: ${{ secrets.VM_USERNAME }} + + - name: Clean up SSH key + run: | + rm -f ~/.ssh/id_rsa + env: + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} \ No newline at end of file From f4e01777c5aed32002672fd98ded7d40b8d13487 Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 12:17:38 -0700 Subject: [PATCH 05/26] deploy to vm test --- .github/workflows/deploy-gitworker.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index f35fd32..8b120df 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -36,7 +36,12 @@ jobs: - name: Access VM and Check Nginx Status run: | - ssh $VM_USERNAME@$VM_IP "systemctl status nginx" + ssh $VM_USERNAME@$VM_IP + echo "systemctl status nginx" + cd /home/githubactionuser/banana-admin + git pull origin feature/gitworkflow + npm run build + sudo systemctl restart nginx env: SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} VM_IP: ${{ secrets.VM_IP }} From 2949cd2fa5fbb28289fe141abc5bc174b68819ef Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 12:30:32 -0700 Subject: [PATCH 06/26] deploy test 2 --- .github/workflows/deploy-gitworker.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index 8b120df..c8a4ed2 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -37,10 +37,10 @@ jobs: - name: Access VM and Check Nginx Status run: | ssh $VM_USERNAME@$VM_IP - echo "systemctl status nginx" - cd /home/githubactionuser/banana-admin - git pull origin feature/gitworkflow - npm run build + echo "sudo systemctl status nginx" + sudo cd /home/githubactionuser/banana-admin + sudo git pull origin feature/gitworkflow + sudo npm run build sudo systemctl restart nginx env: SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} From 79744208304a3381a60656ee89b4faf768aa8498 Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 12:32:12 -0700 Subject: [PATCH 07/26] deploy test 3 --- .github/workflows/deploy-gitworker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index c8a4ed2..d4a9b63 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -38,9 +38,9 @@ jobs: run: | ssh $VM_USERNAME@$VM_IP echo "sudo systemctl status nginx" - sudo cd /home/githubactionuser/banana-admin - sudo git pull origin feature/gitworkflow - sudo npm run build + cd /home/githubactionuser/banana-admin + git pull origin feature/gitworkflow + npm run build sudo systemctl restart nginx env: SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} From 16e37857717dd695d423d0633b437cd39f25ca33 Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 12:34:05 -0700 Subject: [PATCH 08/26] deploy test 4 --- .github/workflows/deploy-gitworker.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index d4a9b63..62d4694 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -36,8 +36,9 @@ jobs: - name: Access VM and Check Nginx Status run: | - ssh $VM_USERNAME@$VM_IP - echo "sudo systemctl status nginx" + ssh $VM_USERNAME@$VM_IP + pwd + sudo systemctl status nginx cd /home/githubactionuser/banana-admin git pull origin feature/gitworkflow npm run build From 8d4868ee293e4750efd0623b18dd798413474c98 Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 12:36:20 -0700 Subject: [PATCH 09/26] test deploy 5 --- .github/workflows/deploy-gitworker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index 62d4694..e4b39a7 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -40,6 +40,7 @@ jobs: pwd sudo systemctl status nginx cd /home/githubactionuser/banana-admin + ls git pull origin feature/gitworkflow npm run build sudo systemctl restart nginx From e1c8930f9acb9bdb02ddd17f524997789e4c8251 Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 12:55:37 -0700 Subject: [PATCH 10/26] test deploy 6 --- .github/workflows/deploy-gitworker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index e4b39a7..6772109 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -36,7 +36,7 @@ jobs: - name: Access VM and Check Nginx Status run: | - ssh $VM_USERNAME@$VM_IP + ssh $VM_USERNAME@$VM_IP < Date: Sat, 4 Nov 2023 13:02:40 -0700 Subject: [PATCH 11/26] test deploy 7 --- .github/workflows/deploy-gitworker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index 6772109..1a51159 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -42,7 +42,7 @@ jobs: cd /home/githubactionuser/banana-admin ls git pull origin feature/gitworkflow - npm run build + yarn run build sudo systemctl restart nginx EOF env: From 7841ec917f4069d2f816a21e57b9b3635c1e57cb Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 13:08:34 -0700 Subject: [PATCH 12/26] test deploy 8 --- .github/workflows/deploy-gitworker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index 1a51159..b873d09 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -40,7 +40,6 @@ jobs: pwd sudo systemctl status nginx cd /home/githubactionuser/banana-admin - ls git pull origin feature/gitworkflow yarn run build sudo systemctl restart nginx From 183df063fb7ee29e14a2b01f2256225edb569950 Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 13:16:58 -0700 Subject: [PATCH 13/26] test deploy 9 --- .github/workflows/deploy-gitworker.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index b873d09..974291a 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -36,14 +36,8 @@ jobs: - name: Access VM and Check Nginx Status run: | - ssh $VM_USERNAME@$VM_IP < Date: Sat, 4 Nov 2023 13:20:16 -0700 Subject: [PATCH 14/26] test deploy 10 --- .github/workflows/deploy-gitworker.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index 974291a..91ce5d0 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -6,19 +6,8 @@ on: - feature/gitworkflow jobs: - build: - runs-on: ubuntu-20.04 - steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Install Node.js and dependencies - uses: actions/setup-node@v2 - with: - node-version: '19.0.1' deploy: - needs: build runs-on: ubuntu-20.04 steps: - name: Checkout code From 4482f266e9ce8c0f21993f90022deb168af4c9b9 Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 14:39:45 -0700 Subject: [PATCH 15/26] test deploy 11 --- .github/workflows/deploy-gitworker.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index 91ce5d0..e034506 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -23,10 +23,22 @@ jobs: SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} VM_IP: ${{ secrets.VM_IP }} - - name: Access VM and Check Nginx Status - run: | - ssh $VM_USERNAME@$VM_IP "sudo systemctl status nginx" - ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin && git pull origin feature/gitworkflow && yarn run build && sudo systemctl restart nginx" + - name: Update code on VM + run: ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin && git pull origin feature/gitworkflow" + env: + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + VM_IP: ${{ secrets.VM_IP }} + VM_USERNAME: ${{ secrets.VM_USERNAME }} + + - name: Build code on VM + run: ssh $VM_USERNAME@$VM_IP "yarn run build" + env: + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + VM_IP: ${{ secrets.VM_IP }} + VM_USERNAME: ${{ secrets.VM_USERNAME }} + + - name: Restart Nginx server + run: ssh $VM_USERNAME@$VM_IP "sudo systemctl restart nginx" env: SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} VM_IP: ${{ secrets.VM_IP }} From 52534a785a0c24a530726b79a3ec7be4f6c03d08 Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 14:55:17 -0700 Subject: [PATCH 16/26] test deploy 12 --- src/Pages/LoginPage/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/LoginPage/index.js b/src/Pages/LoginPage/index.js index 421ed5e..2b6cee9 100644 --- a/src/Pages/LoginPage/index.js +++ b/src/Pages/LoginPage/index.js @@ -60,7 +60,7 @@ export default function LoginPage() { -

BRENDAN PORTAL

+

BRENDAN PORTAL 2

From b01b64d2955b14bba6c5e53b22d88706cece15b9 Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 14:58:06 -0700 Subject: [PATCH 17/26] test deploy 13 --- .github/workflows/deploy-gitworker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index e034506..97eb13f 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -31,7 +31,7 @@ jobs: VM_USERNAME: ${{ secrets.VM_USERNAME }} - name: Build code on VM - run: ssh $VM_USERNAME@$VM_IP "yarn run build" + run: ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin && yarn run build" env: SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} VM_IP: ${{ secrets.VM_IP }} From 8f0ea1fdd1354e010778dc7e343af5978c200b97 Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 15:12:07 -0700 Subject: [PATCH 18/26] test deploy 13 - check node v --- .github/workflows/deploy-gitworker.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index 97eb13f..3acbe8a 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -30,6 +30,13 @@ jobs: VM_IP: ${{ secrets.VM_IP }} VM_USERNAME: ${{ secrets.VM_USERNAME }} + - name: Check node version + run: ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin && node -v" + env: + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + VM_IP: ${{ secrets.VM_IP }} + VM_USERNAME: ${{ secrets.VM_USERNAME }} + - name: Build code on VM run: ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin && yarn run build" env: From 17c58eae86c9ce490620af84dd580d4691032fc9 Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 15:15:05 -0700 Subject: [PATCH 19/26] test deploy 14 - use nvm --- .github/workflows/deploy-gitworker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index 3acbe8a..84fd28d 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -31,14 +31,14 @@ jobs: VM_USERNAME: ${{ secrets.VM_USERNAME }} - name: Check node version - run: ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin && node -v" + run: ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin" env: SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} VM_IP: ${{ secrets.VM_IP }} VM_USERNAME: ${{ secrets.VM_USERNAME }} - name: Build code on VM - run: ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin && yarn run build" + run: ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin && nvm use 19 && yarn run build" env: SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} VM_IP: ${{ secrets.VM_IP }} From 5068ef2c5d853703eaf1620891b278d3419973ee Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 15:25:50 -0700 Subject: [PATCH 20/26] test deploy 15 - install node and nvm --- .github/workflows/deploy-gitworker.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index 84fd28d..616ab50 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -23,6 +23,13 @@ jobs: SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} VM_IP: ${{ secrets.VM_IP }} + - name: Install nvm and node.js + run: | + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash + source ~/.nvm/nvm.sh + nvm install 19 + nvm use 19 + - name: Update code on VM run: ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin && git pull origin feature/gitworkflow" env: From 6a1d48b66286e1d8940cc315b50344435d76cea9 Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 15:28:09 -0700 Subject: [PATCH 21/26] test deploy 16 - take out nvm use --- .github/workflows/deploy-gitworker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index 616ab50..c3bdaf6 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -45,7 +45,7 @@ jobs: VM_USERNAME: ${{ secrets.VM_USERNAME }} - name: Build code on VM - run: ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin && nvm use 19 && yarn run build" + run: ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin && yarn run build" env: SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} VM_IP: ${{ secrets.VM_IP }} From 665fa589472be63529739b967862290e46bf37f1 Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 15:32:22 -0700 Subject: [PATCH 22/26] test deploy 17 - check node version in build stage --- .github/workflows/deploy-gitworker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index c3bdaf6..0f6650b 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -45,7 +45,7 @@ jobs: VM_USERNAME: ${{ secrets.VM_USERNAME }} - name: Build code on VM - run: ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin && yarn run build" + run: ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin && node -v && yarn run build" env: SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} VM_IP: ${{ secrets.VM_IP }} From 54aec10cf32c91670211eb12513e106856d81cda Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 15:37:43 -0700 Subject: [PATCH 23/26] nvm in build stage fix --- .github/workflows/deploy-gitworker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index 0f6650b..c9322d6 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -45,7 +45,7 @@ jobs: VM_USERNAME: ${{ secrets.VM_USERNAME }} - name: Build code on VM - run: ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin && node -v && yarn run build" + run: ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin && source ~/.nvm/nvm.sh && nvm use 19 && yarn run build" env: SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} VM_IP: ${{ secrets.VM_IP }} From 4115d49171316ef10cf86900f63cb288dc58cc72 Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 4 Nov 2023 15:40:52 -0700 Subject: [PATCH 24/26] test need for nvm use in Install stage --- .github/workflows/deploy-gitworker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index c9322d6..ae5e17c 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -23,12 +23,11 @@ jobs: SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} VM_IP: ${{ secrets.VM_IP }} - - name: Install nvm and node.js + - name: Install nvm run: | curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash source ~/.nvm/nvm.sh nvm install 19 - nvm use 19 - name: Update code on VM run: ssh $VM_USERNAME@$VM_IP "cd /home/githubactionuser/banana-admin && git pull origin feature/gitworkflow" From 0dab225ccbe8fa81ab00b484ab1304d0d1b2c7ff Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Sat, 11 Nov 2023 11:54:15 -0800 Subject: [PATCH 25/26] brendan portal 3 --- src/Pages/LoginPage/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/LoginPage/index.js b/src/Pages/LoginPage/index.js index 2b6cee9..c4948c5 100644 --- a/src/Pages/LoginPage/index.js +++ b/src/Pages/LoginPage/index.js @@ -60,7 +60,7 @@ export default function LoginPage() { -

BRENDAN PORTAL 2

+

BRENDAN PORTAL 3

From 99aafe2c9dd908b4ca52772dd585a206f43f7e25 Mon Sep 17 00:00:00 2001 From: brendobrendo Date: Tue, 21 Nov 2023 07:54:03 -0500 Subject: [PATCH 26/26] Update to run on PR mergest to the master branch --- .github/workflows/deploy-gitworker.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-gitworker.yml b/.github/workflows/deploy-gitworker.yml index ae5e17c..65c1654 100644 --- a/.github/workflows/deploy-gitworker.yml +++ b/.github/workflows/deploy-gitworker.yml @@ -1,13 +1,14 @@ -name: Build and Deploy to VM +name: Build and Deploy to the Admin Portal VM on: - push: + pull_request: branches: - - feature/gitworkflow + - master + types: [closed] jobs: - deploy: + if: github.event.pull_request.merged == true runs-on: ubuntu-20.04 steps: - name: Checkout code