From 94f726d62228fff711a4903bdea01da793ae999f Mon Sep 17 00:00:00 2001 From: Shane <6071159+smashedr@users.noreply.github.com> Date: Sun, 14 Jun 2026 08:56:14 -0700 Subject: [PATCH 1/3] Update Workflows --- .github/workflows/build.yaml | 40 +++++++++++++++++++++++++++++++---- .github/workflows/deploy.yaml | 16 +++++++------- .github/workflows/lint.yaml | 3 +-- .github/workflows/render.yaml | 6 +++--- 4 files changed, 48 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d1c7def..a4c444a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -26,9 +26,18 @@ jobs: contents: write packages: write + #environment: + # name: docker + # url: https://hub.docker.com/r/${{ github.repository }} + steps: + - name: "Checkout" + uses: actions/checkout@v6 + + - name: "Debug event.json" + continue-on-error: true + run: cat "${GITHUB_EVENT_PATH}" - name: "Debug CTX github" - if: ${{ !github.event.act }} continue-on-error: true env: GITHUB_CTX: ${{ toJSON(github) }} @@ -42,16 +51,28 @@ jobs: echo "inputs.dev: ${{ inputs.dev }}" echo "env.dev: ${{ env.dev }}" - - name: "Checkout" - uses: actions/checkout@v6 + - name: "Update Package Version" + uses: cssnr/update-json-value-action@v2 + with: + file: "package.json" + + - name: "Debug Package File" + continue-on-error: true + run: cat package.json - - name: "Docker Login" + - name: "Docker Login - GHCR" uses: docker/login-action@v4 with: registry: ghcr.io username: ${{ vars.GHCR_USER }} password: ${{ secrets.GHCR_PASS }} + #- name: "Docker Login - Hub" + # uses: docker/login-action@v4 + # with: + # username: ${{ vars.DOCKER_HUB_USER }} + # password: ${{ secrets.DOCKER_HUB_PASS }} + - name: "Setup QEMU" uses: docker/setup-qemu-action@v4 @@ -82,6 +103,9 @@ jobs: uses: cssnr/docker-tags-action@v2 with: images: "ghcr.io/${{ github.repository }}" + #images: | + # ${{ github.repository }} + # ghcr.io/${{ github.repository }} tags: | ${{ env.dev }} ${{ steps.version.outputs.tags }} @@ -109,6 +133,14 @@ jobs: build-args: | VERSION=${{ github.ref_name }} + #- name: "Docker Hub Description" + # uses: peter-evans/dockerhub-description@v5 + # continue-on-error: true + # with: + # username: ${{ vars.DOCKER_HUB_USER }} + # password: ${{ secrets.DOCKER_HUB_PASS }} + # repository: ${{ github.repository }} + - name: "Send Failure Notification" if: ${{ failure() }} uses: sarisia/actions-status-discord@eb045afee445dc055c18d3d90bd0f244fd062708 # v1.16.0 diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 606a457..e84ec2f 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -73,14 +73,14 @@ jobs: VERSION: "${{ env.version }}" STACK_NAME: "${{ env.stack-name }}" TRAEFIK_HOST: "${{ env.traefik-host }}" - GITHUB_TOKEN": "${{ secrets.GH_PAT }}" - VT_API_KEY": "${{ secrets.VT_API_KEY }}" - SENTRY_URL": "${{ secrets.SENTRY_URL }}" - SENTRY_ENVIRONMENT": "prod" - INFLUX_URL": "${{ secrets.INFLUX_URL }}" - INFLUX_TOKEN": "${{ secrets.INFLUX_TOKEN }}" - INFLUX_ORG": "${{ vars.INFLUX_ORG }}" - INFLUX_BUCKET": "${{ vars.INFLUX_BUCKET }} + GITHUB_TOKEN: "${{ secrets.GH_PAT }}" + VT_API_KEY: "${{ secrets.VT_API_KEY }}" + SENTRY_URL: "${{ secrets.SENTRY_URL }}" + SENTRY_ENVIRONMENT: "prod" + INFLUX_URL: "${{ secrets.INFLUX_URL }}" + INFLUX_TOKEN: "${{ secrets.INFLUX_TOKEN }}" + INFLUX_ORG: "${{ vars.INFLUX_ORG }}" + INFLUX_BUCKET: "${{ vars.INFLUX_BUCKET }}" ## https://render.com/docs/deploy-hooks#deploying-from-an-image-registry #- name: "Deploy Image" diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 4160d71..c0536ca 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -36,8 +36,7 @@ jobs: - name: "eslint" if: ${{ !cancelled() }} - run: | - npm run lint + run: npm run lint - name: "prettier" if: ${{ !cancelled() }} diff --git a/.github/workflows/render.yaml b/.github/workflows/render.yaml index e95d073..ca3ba3e 100644 --- a/.github/workflows/render.yaml +++ b/.github/workflows/render.yaml @@ -64,7 +64,7 @@ jobs: version: ${{ env.version == 'master' && 'latest' || env.version }} run: | echo "github.ref_name: ${{ github.ref_name }}" - echo "inputs.version: ${{ inputs.version }}" + echo "env.version: ${{ env.version }}" echo "env.version: ${{ env.version }}" echo "--------------------" echo "imgURL: ghcr.io/${{ github.repository }}:${{ env.version }}" @@ -72,7 +72,7 @@ jobs: # https://render.com/docs/deploy-hooks#deploying-from-an-image-registry # NOTE: Confirm we can do image and dockerfile deployments simultaneously... - name: "Deploy Image" - if: ${{ inputs.version }} + if: ${{ env.version }} uses: cssnr/web-request-action@v2 env: version: ${{ env.version == 'master' && 'latest' || env.version }} @@ -82,7 +82,7 @@ jobs: imgURL: ghcr.io/${{ github.repository }}:${{ env.version }} - name: "Deploy Branch" - if: ${{ !inputs.version }} + if: ${{ !env.version }} uses: cssnr/web-request-action@v2 with: url: ${{ secrets.RENDER_HOOK }} From 73ce89d4443f4cacdc84cf65e226e1ad209ae3da Mon Sep 17 00:00:00 2001 From: Shane <6071159+smashedr@users.noreply.github.com> Date: Sun, 14 Jun 2026 09:01:38 -0700 Subject: [PATCH 2/3] Update Workflows --- .github/workflows/render.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/render.yaml b/.github/workflows/render.yaml index ca3ba3e..ef29c38 100644 --- a/.github/workflows/render.yaml +++ b/.github/workflows/render.yaml @@ -72,7 +72,7 @@ jobs: # https://render.com/docs/deploy-hooks#deploying-from-an-image-registry # NOTE: Confirm we can do image and dockerfile deployments simultaneously... - name: "Deploy Image" - if: ${{ env.version }} + if: ${{ inputs.version }} uses: cssnr/web-request-action@v2 env: version: ${{ env.version == 'master' && 'latest' || env.version }} @@ -82,7 +82,7 @@ jobs: imgURL: ghcr.io/${{ github.repository }}:${{ env.version }} - name: "Deploy Branch" - if: ${{ !env.version }} + if: ${{ !inputs.version }} uses: cssnr/web-request-action@v2 with: url: ${{ secrets.RENDER_HOOK }} From be52215f6b4471edc161a3baf29da5f7a7d72c53 Mon Sep 17 00:00:00 2001 From: Shane <6071159+smashedr@users.noreply.github.com> Date: Sun, 14 Jun 2026 09:06:41 -0700 Subject: [PATCH 3/3] Update Workflows --- .github/workflows/render.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/render.yaml b/.github/workflows/render.yaml index ef29c38..e95d073 100644 --- a/.github/workflows/render.yaml +++ b/.github/workflows/render.yaml @@ -64,7 +64,7 @@ jobs: version: ${{ env.version == 'master' && 'latest' || env.version }} run: | echo "github.ref_name: ${{ github.ref_name }}" - echo "env.version: ${{ env.version }}" + echo "inputs.version: ${{ inputs.version }}" echo "env.version: ${{ env.version }}" echo "--------------------" echo "imgURL: ghcr.io/${{ github.repository }}:${{ env.version }}"