From 8f329d8e1323309501ee548937165b83424495be Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 11:48:31 -0400 Subject: [PATCH 01/10] Update web-deploy.yml --- .github/workflows/web-deploy.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/web-deploy.yml b/.github/workflows/web-deploy.yml index 673f4da..9f74e95 100644 --- a/.github/workflows/web-deploy.yml +++ b/.github/workflows/web-deploy.yml @@ -15,7 +15,7 @@ on: paths: - web/** jobs: - deploy: + build: environment: dev runs-on: ['self-hosted', 'pi'] permissions: @@ -33,6 +33,13 @@ jobs: run: docker build -f web/Dockerfile -t john4064/shiftsync:latest_web ./web --build-arg TEST=${{ secrets.TEST }} - name: Docker Push Backend run: docker push john4064/shiftsync:latest_web + deploy: + environment: dev + runs-on: ['self-hosted', 'pi'] + permissions: + contents: read + packages: write + steps: - name: Deploy to Coolify run: | curl --request GET '${{ secrets.COOLIFY_WEBHOOK }}' --header 'Authorization: Bearer ${{ secrets.COOLIFY_TOKEN }}' From 6a92463aac97ab6ba15054acfa1e7e565dcfa5ef Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 11:48:58 -0400 Subject: [PATCH 02/10] Update Home.jsx --- web/src/pages/Home/Home.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/web/src/pages/Home/Home.jsx b/web/src/pages/Home/Home.jsx index 4a75291..70d33d3 100644 --- a/web/src/pages/Home/Home.jsx +++ b/web/src/pages/Home/Home.jsx @@ -17,6 +17,7 @@ export const Home = () => {

Home Page

Go to Settings +

Version: {pkg.version}

); From 6e1417ca6e62d1d2225d84b4b0e62d495b8d3f14 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 11:51:03 -0400 Subject: [PATCH 03/10] Update web-deploy.yml --- .github/workflows/web-deploy.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/web-deploy.yml b/.github/workflows/web-deploy.yml index 9f74e95..7d136f2 100644 --- a/.github/workflows/web-deploy.yml +++ b/.github/workflows/web-deploy.yml @@ -17,7 +17,7 @@ on: jobs: build: environment: dev - runs-on: ['self-hosted', 'pi'] + runs-on: 'ubuntu-latest' permissions: contents: read packages: write @@ -35,7 +35,8 @@ jobs: run: docker push john4064/shiftsync:latest_web deploy: environment: dev - runs-on: ['self-hosted', 'pi'] + needs: build + runs-on: 'ubuntu-latest' permissions: contents: read packages: write From 786ec7536cd48c44a679ccf2f83c6e703fc0654f Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 11:51:19 -0400 Subject: [PATCH 04/10] Update Home.jsx --- web/src/pages/Home/Home.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/web/src/pages/Home/Home.jsx b/web/src/pages/Home/Home.jsx index 70d33d3..4a75291 100644 --- a/web/src/pages/Home/Home.jsx +++ b/web/src/pages/Home/Home.jsx @@ -17,7 +17,6 @@ export const Home = () => {

Home Page

Go to Settings -

Version: {pkg.version}

); From 4c5a07876762dc2bc5faf719ffe8d702bf8c400a Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 11:58:50 -0400 Subject: [PATCH 05/10] Update web-deploy.yml --- .github/workflows/web-deploy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/web-deploy.yml b/.github/workflows/web-deploy.yml index 7d136f2..0faa842 100644 --- a/.github/workflows/web-deploy.yml +++ b/.github/workflows/web-deploy.yml @@ -36,6 +36,7 @@ jobs: deploy: environment: dev needs: build + if: always() && needs.build.result == 'success' runs-on: 'ubuntu-latest' permissions: contents: read From 88e3486bad5653c89e7efb4de3ad6c66091dd177 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 12:03:49 -0400 Subject: [PATCH 06/10] Update web-deploy.yml --- .github/workflows/web-deploy.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/web-deploy.yml b/.github/workflows/web-deploy.yml index 0faa842..e97de76 100644 --- a/.github/workflows/web-deploy.yml +++ b/.github/workflows/web-deploy.yml @@ -15,8 +15,20 @@ on: paths: - web/** jobs: + pr-validation: + permissions: + contents: read + pull-requests: write + runs-on: ['self-hosted', 'pi'] + steps: + - uses: TimonVS/pr-labeler-action@v5 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + configuration-path: .github/configs/pr-labeler-configuration.yml build: environment: dev + needs: pr-validation + if: always() && needs.pr-validation.result == 'success' runs-on: 'ubuntu-latest' permissions: contents: read From 291417efc9d69d0126683bf680297ff0d367b2e8 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 12:05:00 -0400 Subject: [PATCH 07/10] Delete .github/workflows/pr-validation.yml --- .github/workflows/pr-validation.yml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 .github/workflows/pr-validation.yml diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml deleted file mode 100644 index 3797c32..0000000 --- a/.github/workflows/pr-validation.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: PR Validation -on: - pull_request: - types: [opened] - -permissions: - contents: read - -jobs: - pr-validation: - permissions: - contents: read - pull-requests: write - runs-on: ['self-hosted', 'pi'] - steps: - - uses: TimonVS/pr-labeler-action@v5 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - configuration-path: .github/configs/pr-labeler-configuration.yml From 8041173264715df5926d8e3d3d020439060fe400 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 12:06:44 -0400 Subject: [PATCH 08/10] Create pr-validation.yml --- .github/workflows/pr-validation.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/pr-validation.yml diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml new file mode 100644 index 0000000..3797c32 --- /dev/null +++ b/.github/workflows/pr-validation.yml @@ -0,0 +1,19 @@ +name: PR Validation +on: + pull_request: + types: [opened] + +permissions: + contents: read + +jobs: + pr-validation: + permissions: + contents: read + pull-requests: write + runs-on: ['self-hosted', 'pi'] + steps: + - uses: TimonVS/pr-labeler-action@v5 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + configuration-path: .github/configs/pr-labeler-configuration.yml From 904542751581e8ac55acad430fc9b8ed4cf557f0 Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 12:07:18 -0400 Subject: [PATCH 09/10] Update web-deploy.yml --- .github/workflows/web-deploy.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/web-deploy.yml b/.github/workflows/web-deploy.yml index e97de76..85acda5 100644 --- a/.github/workflows/web-deploy.yml +++ b/.github/workflows/web-deploy.yml @@ -15,16 +15,6 @@ on: paths: - web/** jobs: - pr-validation: - permissions: - contents: read - pull-requests: write - runs-on: ['self-hosted', 'pi'] - steps: - - uses: TimonVS/pr-labeler-action@v5 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - configuration-path: .github/configs/pr-labeler-configuration.yml build: environment: dev needs: pr-validation From 92a75771b96c83b71fe7bfb7431958849bcd127d Mon Sep 17 00:00:00 2001 From: Matt DiMeglio Date: Wed, 11 Jun 2025 12:08:14 -0400 Subject: [PATCH 10/10] Update web-deploy.yml --- .github/workflows/web-deploy.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/web-deploy.yml b/.github/workflows/web-deploy.yml index 85acda5..0faa842 100644 --- a/.github/workflows/web-deploy.yml +++ b/.github/workflows/web-deploy.yml @@ -17,8 +17,6 @@ on: jobs: build: environment: dev - needs: pr-validation - if: always() && needs.pr-validation.result == 'success' runs-on: 'ubuntu-latest' permissions: contents: read