From 662dcc0a641c2583daf2d061e39bb8077c49e929 Mon Sep 17 00:00:00 2001 From: Noah Spannbauer Date: Sun, 23 Nov 2025 10:47:54 -0600 Subject: [PATCH] updating infrastructure --- .github/workflows/changes.yaml | 10 +++++----- .github/workflows/main.yaml | 2 +- .github/workflows/pull_request.yaml | 19 ++++--------------- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/.github/workflows/changes.yaml b/.github/workflows/changes.yaml index 917786e..1d864c4 100644 --- a/.github/workflows/changes.yaml +++ b/.github/workflows/changes.yaml @@ -4,8 +4,8 @@ on: outputs: api: value: ${{ jobs.changes.outputs.api }} - app: - value: ${{ jobs.changes.outputs.app }} + client: + value: ${{ jobs.changes.outputs.client }} jobs: changes: @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest outputs: api: ${{ steps.filter.outputs.api }} - app: ${{ steps.filter.outputs.app }} + client: ${{ steps.filter.outputs.client }} steps: - uses: actions/checkout@v3 @@ -24,5 +24,5 @@ jobs: filters: | api: - 'api/**' - app: - - 'app/**' \ No newline at end of file + client: + - 'client/**' \ No newline at end of file diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 0fd1067..7a6378b 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -9,7 +9,7 @@ jobs: uses: ./.github/workflows/changes.yaml build: - if: ${{ needs.changes.outputs.app == 'true' }} + if: ${{ needs.changes.outputs.app == 'true' || needs.changes.outputs.client == 'true' }} name: build needs: - changes diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 3de7e68..6a219ed 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -7,23 +7,12 @@ jobs: changes: uses: ./.github/workflows/changes.yaml - build-api: - if: ${{ needs.changes.outputs.api == 'true' }} - name: build-api + build: + if: ${{ needs.changes.outputs.app == 'true' || needs.changes.outputs.client == 'true'}} + name: build needs: - changes - uses: ./.github/workflows/api_build.yaml - with: - environment_name: pull_request - version_number: ${{ github.run_id }} - secrets: inherit - - build-app: - if: ${{ needs.changes.outputs.app == 'true' }} - name: build-app - needs: - - changes - uses: ./.github/workflows/app_build.yaml + uses: ./.github/workflows/build.yaml with: environment_name: pull_request version_number: ${{ github.run_id }}