From 0e199d9c0fbbe3401301f84072953eb6f64aa50d Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 07:31:50 +1300 Subject: [PATCH 01/50] Implements github actions --- .github/labeler.yml | 15 +++++++ .github/workflows/backend-workflow.yml | 52 +++++++++++++++++++++++++ .github/workflows/compare-changes.yml | 45 +++++++++++++++++++++ .github/workflows/frontend-workflow.yml | 42 ++++++++++++++++++++ 4 files changed, 154 insertions(+) create mode 100644 .github/labeler.yml create mode 100644 .github/workflows/backend-workflow.yml create mode 100644 .github/workflows/compare-changes.yml create mode 100644 .github/workflows/frontend-workflow.yml diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 0000000..cffa424 --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,15 @@ +backend: + - changed-files: + - any-glob-to-any-file: + - '*gradle*' + - gradle/** + - openapi/** + - src/** +frontend: + - changed-files: + - any-glob-to-any-file: + - web/** +workflows: + - changed-files: + - any-glob-to-any-file: + - .github/** \ No newline at end of file diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml new file mode 100644 index 0000000..e28ee2f --- /dev/null +++ b/.github/workflows/backend-workflow.yml @@ -0,0 +1,52 @@ +name: Landonlite Backend Workflow + +on: + pull_request: + branches: + - "master" + +jobs: + Compare-changes: + uses: ./.github/workflows/compare-changes.yml + + print-compare-changes-output: + runs-on: ubuntu-latest + needs: Compare-changes + steps: + - run: echo "BackendDisable ${{ needs.compare-changes.outputs.backendDisable }}" + - run: printf "backendDisable ${{ needs.Compare-changes.outputs.backendDisable == 'true' }}\n" + printf "playwrightDisable ${{ needs.Compare-changes.outputs.playwrightDisable == 'true' }}" + + backend-tests: + needs: + - Compare-changes + + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: '11' + + - name: Cache Gradle packages + uses: actions/cache@v2 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Build with Gradle + run: ./gradlew build + + - name: Run tests + run: ./gradlew test \ No newline at end of file diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml new file mode 100644 index 0000000..c790feb --- /dev/null +++ b/.github/workflows/compare-changes.yml @@ -0,0 +1,45 @@ +name: Compare changes +on: + workflow_call: + outputs: + backendDisable: + value: ${{ jobs.compare-changes.outputs.backendDisable && jobs.compare-changes.outputs.workflowsDisable }} + frontendDisable: + value: ${{ jobs.compare-changes.outputs.frontendDisable && jobs.compare-changes.outputs.workflowsDisable }} + playwrightDisable: + value: ${{ jobs.compare-changes.outputs.playwrightDisable && jobs.compare-changes.outputs.workflowsDisable && jobs.compare-changes.outputs.backendDisable && jobs.compare-changes.outputs.frontendDisable }} + +jobs: + compare-changes: + runs-on: ubuntu-latest + permissions: + contents: read + pull-requests: write + outputs: + backendDisable: ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'backend') }} + frontendDisable: ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') }} + playwrightDisable: ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'playwright') }} + workflowsDisable: ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') }} + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + + - name: Get changed files + id: changed-files + uses: linz/action-change-labeler@5552aadd9f8d2ca6df5515487a2e0cb6c5226b26 # v1.0.0 + + - run: echo "Changes detected ${{ steps.changed-files.outputs.changes }}" + - run: echo "backend changed" + if: contains(fromJSON(steps.changed-files.outputs.changes), 'backend') + - run: echo "frontend changed" + if: contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') + - run: echo "playwright changed" + if: contains(fromJSON(steps.changed-files.outputs.changes), 'playwright') + - run: echo "workflows changed" + if: contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') + + - name: Check for both frontend and backend changes + if: ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') && contains(fromJSON(steps.changed-files.outputs.changes), 'frontend')}} + uses: actions/github-script@v7 + with: + script: | + core.setFailed('PR has both FE and BE changes, please split your FE and BE changes into separate PRs') \ No newline at end of file diff --git a/.github/workflows/frontend-workflow.yml b/.github/workflows/frontend-workflow.yml new file mode 100644 index 0000000..37f7155 --- /dev/null +++ b/.github/workflows/frontend-workflow.yml @@ -0,0 +1,42 @@ +name: Landonlite Frontend Workflow +on: + pull_request: + branches: + - "master" + +jobs: + compare-changes: + uses: ./.github/workflows/compare-changes.yml + + print-compare-changes-output: + runs-on: ubuntu-latest + needs: compare-changes + steps: + - run: echo "FrontendDisable ${{ needs.compare-changes.outputs.frontendDisable }}" + - run: printf "should run frontend CI ${{ needs.compare-changes.outputs.frontendDisable == 'false' }}\n" + + frontend-test: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up Node.js + uses: actions/setup-node@v2 + with: + node-version: '16' + + - name: Cache npm packages + uses: actions/cache@v2 + with: + path: ~/.npm + key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-node- + + - name: Install dependencies + run: npm install + + - name: Run tests + run: npm test \ No newline at end of file From 4e24be04d7a4498a2343eea268fe7dca00ab4c80 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 07:51:25 +1300 Subject: [PATCH 02/50] Adds the action-change-labeler --- .github/workflows/actions-change-labeler.yml | 56 ++++++++++++++++++++ .github/workflows/compare-changes.yml | 2 +- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/actions-change-labeler.yml diff --git a/.github/workflows/actions-change-labeler.yml b/.github/workflows/actions-change-labeler.yml new file mode 100644 index 0000000..593ad79 --- /dev/null +++ b/.github/workflows/actions-change-labeler.yml @@ -0,0 +1,56 @@ +name: Determine labels based on the paths of files being changed in the pull requests. + +inputs: + configuration-path: + description: "The path for the label configurations" + default: ".github/labeler.yml" + required: false + dot: + description: "Whether or not to include paths starting with dot (e.g. `.github`) in glob matching" + default: true + required: false + repo-token: + description: "The GitHub token used to manage labels" + required: false + +outputs: + changes: + description: A JSON encoded list of all changes detected. e.g. `["backend", "frontend"]` + value: ${{ steps.derive-changes.outputs.result }} + +runs: + using: composite + steps: + - id: labler + if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }} + # for PRs, use the actions/labeler action to determine change labels + uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 + with: + repo-token: ${{ inputs.repo-token }} + configuration-path: ${{ inputs.configuration-path }} + dot: ${{ inputs.dot }} + sync-labels: "true" + + # Read the configuration file and use that to filter out unrelated labels in the PR + # e.g. labels added manually, or added by other bots/actions + - id: read-config + shell: bash + run: | + echo "Reading configuration file into JSON" + config=$(yq -o=json -I=0 "$CONFIG_PATH") + echo "config=$config" >> "$GITHUB_OUTPUT" + env: + CONFIG_PATH: ${{ inputs.configuration-path }} + + - id: derive-changes + uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 + with: + script: | + const labels = new Set((process.env.LABELS || '').split(',')); + const config = JSON.parse(process.env.CONFIG); + const changes = Object.keys(config).filter(key => labels.has(key)); + console.log('changes', changes); + return changes; + env: + CONFIG: ${{ steps.read-config.outputs.config }} + LABELS: ${{ steps.labler.outputs.all-labels || steps.get-labels-from-source-pr.outputs.labels }} \ No newline at end of file diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml index c790feb..4d3fd27 100644 --- a/.github/workflows/compare-changes.yml +++ b/.github/workflows/compare-changes.yml @@ -25,7 +25,7 @@ jobs: - name: Get changed files id: changed-files - uses: linz/action-change-labeler@5552aadd9f8d2ca6df5515487a2e0cb6c5226b26 # v1.0.0 + uses: ./.github/workflows/action-change-labeler - run: echo "Changes detected ${{ steps.changed-files.outputs.changes }}" - run: echo "backend changed" From 64f5309d3db1c8ed8ed7190ba352d2c007a475fc Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 07:54:57 +1300 Subject: [PATCH 03/50] Adds the action-change-labeler --- .github/workflows/compare-changes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml index 4d3fd27..e721a44 100644 --- a/.github/workflows/compare-changes.yml +++ b/.github/workflows/compare-changes.yml @@ -25,7 +25,7 @@ jobs: - name: Get changed files id: changed-files - uses: ./.github/workflows/action-change-labeler + uses: ./.github/workflows/action-change-labeler.yml - run: echo "Changes detected ${{ steps.changed-files.outputs.changes }}" - run: echo "backend changed" From 02ffad15d41bb6aa4a21249e1d320768f8d06ebb Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 08:03:40 +1300 Subject: [PATCH 04/50] Adds the action-change-labeler --- .github/workflows/compare-changes.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml index e721a44..a709ed3 100644 --- a/.github/workflows/compare-changes.yml +++ b/.github/workflows/compare-changes.yml @@ -21,7 +21,8 @@ jobs: playwrightDisable: ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'playwright') }} workflowsDisable: ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') }} steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - name: Checkout code + uses: actions/checkout@v2 - name: Get changed files id: changed-files From 7bf5930b4637ec385fc23d4c61d09848b410db4f Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 08:07:49 +1300 Subject: [PATCH 05/50] Adds the action-change-labeler --- .github/workflows/compare-changes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml index a709ed3..a6e4166 100644 --- a/.github/workflows/compare-changes.yml +++ b/.github/workflows/compare-changes.yml @@ -26,7 +26,7 @@ jobs: - name: Get changed files id: changed-files - uses: ./.github/workflows/action-change-labeler.yml + uses: ./.github/workflows/actions-change-labeler.yml - run: echo "Changes detected ${{ steps.changed-files.outputs.changes }}" - run: echo "backend changed" From 56c2ffd3d36f8289fc6962017c99c4955fe62ed3 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 08:10:03 +1300 Subject: [PATCH 06/50] Adds the action-change-labeler --- .github/workflows/compare-changes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml index a6e4166..03b9856 100644 --- a/.github/workflows/compare-changes.yml +++ b/.github/workflows/compare-changes.yml @@ -26,7 +26,7 @@ jobs: - name: Get changed files id: changed-files - uses: ./.github/workflows/actions-change-labeler.yml + uses: .github/workflows/actions-change-labeler.yml - run: echo "Changes detected ${{ steps.changed-files.outputs.changes }}" - run: echo "backend changed" From 91b5300534a313560c954dea41a461f63ef396dd Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 08:10:47 +1300 Subject: [PATCH 07/50] Adds the action-change-labeler --- .github/workflows/compare-changes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml index 03b9856..a6e4166 100644 --- a/.github/workflows/compare-changes.yml +++ b/.github/workflows/compare-changes.yml @@ -26,7 +26,7 @@ jobs: - name: Get changed files id: changed-files - uses: .github/workflows/actions-change-labeler.yml + uses: ./.github/workflows/actions-change-labeler.yml - run: echo "Changes detected ${{ steps.changed-files.outputs.changes }}" - run: echo "backend changed" From 1b9971ded6138b324e96c66a17a80c7b92f4e571 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 08:13:28 +1300 Subject: [PATCH 08/50] Adds the action-change-labeler --- .github/workflows/{actions-change-labeler.yml => action.yml} | 0 .github/workflows/compare-changes.yml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{actions-change-labeler.yml => action.yml} (100%) diff --git a/.github/workflows/actions-change-labeler.yml b/.github/workflows/action.yml similarity index 100% rename from .github/workflows/actions-change-labeler.yml rename to .github/workflows/action.yml diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml index a6e4166..1a0840a 100644 --- a/.github/workflows/compare-changes.yml +++ b/.github/workflows/compare-changes.yml @@ -26,7 +26,7 @@ jobs: - name: Get changed files id: changed-files - uses: ./.github/workflows/actions-change-labeler.yml + uses: ./.github/workflows/action.yml - run: echo "Changes detected ${{ steps.changed-files.outputs.changes }}" - run: echo "backend changed" From ada9076078a8fcfa8ce7eafec99aa78fb756afd6 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 08:30:15 +1300 Subject: [PATCH 09/50] Adds the action-change-labeler --- .github/{workflows => actions-change-labeler}/action.yml | 0 .github/workflows/compare-changes.yml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename .github/{workflows => actions-change-labeler}/action.yml (100%) diff --git a/.github/workflows/action.yml b/.github/actions-change-labeler/action.yml similarity index 100% rename from .github/workflows/action.yml rename to .github/actions-change-labeler/action.yml diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml index 1a0840a..3fec988 100644 --- a/.github/workflows/compare-changes.yml +++ b/.github/workflows/compare-changes.yml @@ -26,7 +26,7 @@ jobs: - name: Get changed files id: changed-files - uses: ./.github/workflows/action.yml + uses: ./.github/actions-change-labeler/actions.yml - run: echo "Changes detected ${{ steps.changed-files.outputs.changes }}" - run: echo "backend changed" From 0528e24eb130f51fab0927f05750cde0298d1467 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 08:31:15 +1300 Subject: [PATCH 10/50] Adds the action-change-labeler --- .github/workflows/compare-changes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml index 3fec988..6cf0a4d 100644 --- a/.github/workflows/compare-changes.yml +++ b/.github/workflows/compare-changes.yml @@ -26,7 +26,7 @@ jobs: - name: Get changed files id: changed-files - uses: ./.github/actions-change-labeler/actions.yml + uses: ./.github/actions-change-labeler - run: echo "Changes detected ${{ steps.changed-files.outputs.changes }}" - run: echo "backend changed" From da1f19b383cea56b6a50055a47d967c03ed6804e Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 08:34:04 +1300 Subject: [PATCH 11/50] Adds the action-change-labeler --- .github/actions-change-labeler/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions-change-labeler/action.yml b/.github/actions-change-labeler/action.yml index 593ad79..4d6bc21 100644 --- a/.github/actions-change-labeler/action.yml +++ b/.github/actions-change-labeler/action.yml @@ -12,6 +12,7 @@ inputs: repo-token: description: "The GitHub token used to manage labels" required: false + default: ${{ github.token }} outputs: changes: From 2556bb545e839914e0a8e90b058d508e42fa87f1 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 08:37:38 +1300 Subject: [PATCH 12/50] set working directory --- .github/workflows/backend-workflow.yml | 4 +++- .github/workflows/frontend-workflow.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index e28ee2f..1bb266d 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -22,7 +22,9 @@ jobs: - Compare-changes runs-on: ubuntu-latest - + defaults: + run: + working-directory: ./src steps: - name: Checkout code uses: actions/checkout@v2 diff --git a/.github/workflows/frontend-workflow.yml b/.github/workflows/frontend-workflow.yml index 37f7155..da38c84 100644 --- a/.github/workflows/frontend-workflow.yml +++ b/.github/workflows/frontend-workflow.yml @@ -17,7 +17,9 @@ jobs: frontend-test: runs-on: ubuntu-latest - + defaults: + run: + working-directory: ./src steps: - name: Checkout code uses: actions/checkout@v2 From 24fc8016f4fcc0c4de00c32246783dbc4e32702e Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 08:42:40 +1300 Subject: [PATCH 13/50] fixes workflows --- .github/workflows/backend-workflow.yml | 1 + .github/workflows/frontend-workflow.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index 1bb266d..674314d 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -32,6 +32,7 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v2 with: + distribution: corretto java-version: '11' - name: Cache Gradle packages diff --git a/.github/workflows/frontend-workflow.yml b/.github/workflows/frontend-workflow.yml index da38c84..d7735c1 100644 --- a/.github/workflows/frontend-workflow.yml +++ b/.github/workflows/frontend-workflow.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest defaults: run: - working-directory: ./src + working-directory: ./web steps: - name: Checkout code uses: actions/checkout@v2 From 60636883e99f38b8b00777d87a855cbdd336cee2 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 08:44:58 +1300 Subject: [PATCH 14/50] fixes workflows --- .github/workflows/backend-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index 674314d..9840c07 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -33,7 +33,7 @@ jobs: uses: actions/setup-java@v2 with: distribution: corretto - java-version: '11' + java-version: 17 - name: Cache Gradle packages uses: actions/cache@v2 From 187e3957e5024b5ea7e75a53fed9f64d81b9aca0 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 08:47:57 +1300 Subject: [PATCH 15/50] fixes workflows --- .github/workflows/backend-workflow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index 9840c07..52bbe71 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -29,11 +29,11 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v2 + - name: Setup Java + uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: corretto - java-version: 17 + java-version: ${{ inputs.java-version }} - name: Cache Gradle packages uses: actions/cache@v2 From 47a7dd217812f107d8e2d993a10068c5a358dae2 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 08:49:14 +1300 Subject: [PATCH 16/50] fixes workflows --- .github/workflows/backend-workflow.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index 52bbe71..7a89dc2 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -29,11 +29,11 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Setup Java - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 + - name: Set up JDK 17 + uses: actions/setup-java with: distribution: corretto - java-version: ${{ inputs.java-version }} + java-version: 17 - name: Cache Gradle packages uses: actions/cache@v2 From 1a0b13fb8f48bcc3031df98f396a7760c7cc2b2d Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 08:55:14 +1300 Subject: [PATCH 17/50] fixes workflows --- .github/workflows/backend-workflow.yml | 2 +- .github/workflows/compare-changes.yml | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index 7a89dc2..f6de9ab 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -30,7 +30,7 @@ jobs: uses: actions/checkout@v2 - name: Set up JDK 17 - uses: actions/setup-java + uses: actions/setup-java@v4 with: distribution: corretto java-version: 17 diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml index 6cf0a4d..12aa80d 100644 --- a/.github/workflows/compare-changes.yml +++ b/.github/workflows/compare-changes.yml @@ -29,14 +29,15 @@ jobs: uses: ./.github/actions-change-labeler - run: echo "Changes detected ${{ steps.changed-files.outputs.changes }}" - - run: echo "backend changed" - if: contains(fromJSON(steps.changed-files.outputs.changes), 'backend') - - run: echo "frontend changed" - if: contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') - - run: echo "playwright changed" - if: contains(fromJSON(steps.changed-files.outputs.changes), 'playwright') - - run: echo "workflows changed" - if: contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') + echo "backend disabled ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'backend') }}" + echo "backend disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') == 'false'}}" + echo "backend disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') == 'true'}}" + echo "frontend disabled ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') }}" + echo "backend disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') == 'false'}}" + echo "backend disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') == 'true'}}" + echo "workflows changed ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') }}" + echo "backend disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') == 'false'}}" + echo "backend disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') == 'true'}}" - name: Check for both frontend and backend changes if: ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') && contains(fromJSON(steps.changed-files.outputs.changes), 'frontend')}} From 24431cdacc2ab74272acd3cfcc405a4cb01c5b25 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 08:57:55 +1300 Subject: [PATCH 18/50] fixes workflows --- .github/workflows/compare-changes.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml index 12aa80d..150722c 100644 --- a/.github/workflows/compare-changes.yml +++ b/.github/workflows/compare-changes.yml @@ -29,15 +29,18 @@ jobs: uses: ./.github/actions-change-labeler - run: echo "Changes detected ${{ steps.changed-files.outputs.changes }}" - echo "backend disabled ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'backend') }}" + echo "backend ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') }}\n" + echo "backend disabled ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'backend') }}\n" echo "backend disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') == 'false'}}" - echo "backend disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') == 'true'}}" + echo "backend enabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') == 'true'}}" + echo "frontend ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') }}" echo "frontend disabled ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') }}" - echo "backend disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') == 'false'}}" - echo "backend disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') == 'true'}}" - echo "workflows changed ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') }}" - echo "backend disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') == 'false'}}" - echo "backend disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') == 'true'}}" + echo "frontend disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') == 'false'}}" + echo "frontend enabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') == 'true'}}" + echo "workflows ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') }}" + echo "workflows changed ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') }}" + echo "workflows disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') == 'false'}}" + echo "workflows enabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') == 'true'}}" - name: Check for both frontend and backend changes if: ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') && contains(fromJSON(steps.changed-files.outputs.changes), 'frontend')}} From 29ab01e00d6e3df3e4a2695eb1ee8343ab2975d9 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 09:01:43 +1300 Subject: [PATCH 19/50] fixes workflows --- .github/workflows/compare-changes.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml index 150722c..b09f4ce 100644 --- a/.github/workflows/compare-changes.yml +++ b/.github/workflows/compare-changes.yml @@ -31,16 +31,16 @@ jobs: - run: echo "Changes detected ${{ steps.changed-files.outputs.changes }}" echo "backend ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') }}\n" echo "backend disabled ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'backend') }}\n" - echo "backend disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') == 'false'}}" - echo "backend enabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') == 'true'}}" + echo "backend disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') == false }}" + echo "backend enabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') == true }}" echo "frontend ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') }}" echo "frontend disabled ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') }}" - echo "frontend disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') == 'false'}}" - echo "frontend enabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') == 'true'}}" + echo "frontend disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') == false }}" + echo "frontend enabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') == true }}" echo "workflows ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') }}" echo "workflows changed ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') }}" - echo "workflows disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') == 'false'}}" - echo "workflows enabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') == 'true'}}" + echo "workflows disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') == false }}" + echo "workflows enabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') == true }}" - name: Check for both frontend and backend changes if: ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') && contains(fromJSON(steps.changed-files.outputs.changes), 'frontend')}} From e9b47fbb7796e103d341ca3e0eaf59d900427e07 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 09:21:44 +1300 Subject: [PATCH 20/50] Run workflows conditioned to compare changes --- .github/workflows/backend-workflow.yml | 2 +- .github/workflows/compare-changes.yml | 19 ++++++------------- .github/workflows/frontend-workflow.yml | 3 +++ 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index f6de9ab..1a309fb 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -20,7 +20,7 @@ jobs: backend-tests: needs: - Compare-changes - + if: ${{ needs.Compare-changes.outputs.backendDisable == 'false' }} runs-on: ubuntu-latest defaults: run: diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml index b09f4ce..3515021 100644 --- a/.github/workflows/compare-changes.yml +++ b/.github/workflows/compare-changes.yml @@ -3,9 +3,9 @@ on: workflow_call: outputs: backendDisable: - value: ${{ jobs.compare-changes.outputs.backendDisable && jobs.compare-changes.outputs.workflowsDisable }} + value: ${{ jobs.compare-changes.outputs.backendDisable && jobs.compare-changes.outputs.workflowsNotChanged }} frontendDisable: - value: ${{ jobs.compare-changes.outputs.frontendDisable && jobs.compare-changes.outputs.workflowsDisable }} + value: ${{ jobs.compare-changes.outputs.frontendDisable && jobs.compare-changes.outputs.workflowsNotChanged }} playwrightDisable: value: ${{ jobs.compare-changes.outputs.playwrightDisable && jobs.compare-changes.outputs.workflowsDisable && jobs.compare-changes.outputs.backendDisable && jobs.compare-changes.outputs.frontendDisable }} @@ -19,7 +19,7 @@ jobs: backendDisable: ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'backend') }} frontendDisable: ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') }} playwrightDisable: ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'playwright') }} - workflowsDisable: ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') }} + workflowsNotChanged: ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') }} steps: - name: Checkout code uses: actions/checkout@v2 @@ -29,18 +29,11 @@ jobs: uses: ./.github/actions-change-labeler - run: echo "Changes detected ${{ steps.changed-files.outputs.changes }}" - echo "backend ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') }}\n" echo "backend disabled ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'backend') }}\n" - echo "backend disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') == false }}" - echo "backend enabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') == true }}" - echo "frontend ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') }}" echo "frontend disabled ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') }}" - echo "frontend disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') == false }}" - echo "frontend enabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') == true }}" - echo "workflows ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') }}" - echo "workflows changed ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') }}" - echo "workflows disabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') == false }}" - echo "workflows enabled ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') == true }}" + echo "frontend disabled ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') }}" + echo "playwright disabled ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'playwright') }}" + echo "workflows changed ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') }}" - name: Check for both frontend and backend changes if: ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') && contains(fromJSON(steps.changed-files.outputs.changes), 'frontend')}} diff --git a/.github/workflows/frontend-workflow.yml b/.github/workflows/frontend-workflow.yml index d7735c1..9845cb8 100644 --- a/.github/workflows/frontend-workflow.yml +++ b/.github/workflows/frontend-workflow.yml @@ -16,6 +16,9 @@ jobs: - run: printf "should run frontend CI ${{ needs.compare-changes.outputs.frontendDisable == 'false' }}\n" frontend-test: + needs: + - Compare-changes + if: ${{ needs.Compare-changes.outputs.backendDisable == 'false' }} runs-on: ubuntu-latest defaults: run: From 81b864cd0062ecb124302ca92994bab15f374371 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 09:26:34 +1300 Subject: [PATCH 21/50] Run workflows conditioned to compare changes --- .github/workflows/backend-workflow.yml | 2 +- .github/workflows/compare-changes.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index 1a309fb..808a20f 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -46,7 +46,7 @@ jobs: ${{ runner.os }}-gradle- - name: Grant execute permission for gradlew - run: chmod +x gradlew + run: chmod +x ./gradlew - name: Build with Gradle run: ./gradlew build diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml index 3515021..0430915 100644 --- a/.github/workflows/compare-changes.yml +++ b/.github/workflows/compare-changes.yml @@ -31,7 +31,6 @@ jobs: - run: echo "Changes detected ${{ steps.changed-files.outputs.changes }}" echo "backend disabled ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'backend') }}\n" echo "frontend disabled ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') }}" - echo "frontend disabled ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') }}" echo "playwright disabled ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'playwright') }}" echo "workflows changed ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') }}" From ba5fde2fb33609150d287e3d15e8a6e7d0bed51a Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 09:29:16 +1300 Subject: [PATCH 22/50] Ignore workflow changes --- .github/workflows/backend-workflow.yml | 3 --- .github/workflows/compare-changes.yml | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index 808a20f..ea57d92 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -22,9 +22,6 @@ jobs: - Compare-changes if: ${{ needs.Compare-changes.outputs.backendDisable == 'false' }} runs-on: ubuntu-latest - defaults: - run: - working-directory: ./src steps: - name: Checkout code uses: actions/checkout@v2 diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml index 0430915..a67faea 100644 --- a/.github/workflows/compare-changes.yml +++ b/.github/workflows/compare-changes.yml @@ -3,9 +3,9 @@ on: workflow_call: outputs: backendDisable: - value: ${{ jobs.compare-changes.outputs.backendDisable && jobs.compare-changes.outputs.workflowsNotChanged }} + value: ${{ jobs.compare-changes.outputs.backendDisable }} frontendDisable: - value: ${{ jobs.compare-changes.outputs.frontendDisable && jobs.compare-changes.outputs.workflowsNotChanged }} + value: ${{ jobs.compare-changes.outputs.frontendDisable }} playwrightDisable: value: ${{ jobs.compare-changes.outputs.playwrightDisable && jobs.compare-changes.outputs.workflowsDisable && jobs.compare-changes.outputs.backendDisable && jobs.compare-changes.outputs.frontendDisable }} From df0c1bd384e5b0e9990f5a5c4e6615d812942b44 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 09:44:49 +1300 Subject: [PATCH 23/50] Reverts Ignoring workflow changes --- .github/workflows/compare-changes.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml index a67faea..0430915 100644 --- a/.github/workflows/compare-changes.yml +++ b/.github/workflows/compare-changes.yml @@ -3,9 +3,9 @@ on: workflow_call: outputs: backendDisable: - value: ${{ jobs.compare-changes.outputs.backendDisable }} + value: ${{ jobs.compare-changes.outputs.backendDisable && jobs.compare-changes.outputs.workflowsNotChanged }} frontendDisable: - value: ${{ jobs.compare-changes.outputs.frontendDisable }} + value: ${{ jobs.compare-changes.outputs.frontendDisable && jobs.compare-changes.outputs.workflowsNotChanged }} playwrightDisable: value: ${{ jobs.compare-changes.outputs.playwrightDisable && jobs.compare-changes.outputs.workflowsDisable && jobs.compare-changes.outputs.backendDisable && jobs.compare-changes.outputs.frontendDisable }} From 1c104a72d55ece9071e631d18ff24a5ded2bddf2 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 10:59:15 +1300 Subject: [PATCH 24/50] Deactivating BE build and test --- .github/workflows/backend-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index ea57d92..c637200 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -45,8 +45,8 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x ./gradlew - - name: Build with Gradle - run: ./gradlew build +# - name: Build with Gradle +# run: ./gradlew build - name: Run tests run: ./gradlew test \ No newline at end of file From 97454f820d0159f88ccad847075ed17361967692 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 11:01:13 +1300 Subject: [PATCH 25/50] Deactivating BE build and test --- .github/workflows/backend-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index c637200..3daa756 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -48,5 +48,5 @@ jobs: # - name: Build with Gradle # run: ./gradlew build - - name: Run tests - run: ./gradlew test \ No newline at end of file +# - name: Run tests +# run: ./gradlew test \ No newline at end of file From 74c26249827a8b2bf8d2ee0fb406b5c5b194324b Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 13:51:37 +1300 Subject: [PATCH 26/50] FE Changes must run --- web/src/App.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/App.tsx b/web/src/App.tsx index d2e9b61..1b26734 100644 --- a/web/src/App.tsx +++ b/web/src/App.tsx @@ -3,7 +3,7 @@ import {BrowserRouter, Link, Route, Routes} from "react-router-dom"; import TitleSearch from "./TitleSearch"; import {TitlePage} from "./components/TitlePage"; - +// FE CHanges function App() { return (
From ea1b0847a5b4f905d1f524d36adf12399544c671 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 13:55:59 +1300 Subject: [PATCH 27/50] FE Ignore workflows --- .github/workflows/compare-changes.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml index 0430915..a67faea 100644 --- a/.github/workflows/compare-changes.yml +++ b/.github/workflows/compare-changes.yml @@ -3,9 +3,9 @@ on: workflow_call: outputs: backendDisable: - value: ${{ jobs.compare-changes.outputs.backendDisable && jobs.compare-changes.outputs.workflowsNotChanged }} + value: ${{ jobs.compare-changes.outputs.backendDisable }} frontendDisable: - value: ${{ jobs.compare-changes.outputs.frontendDisable && jobs.compare-changes.outputs.workflowsNotChanged }} + value: ${{ jobs.compare-changes.outputs.frontendDisable }} playwrightDisable: value: ${{ jobs.compare-changes.outputs.playwrightDisable && jobs.compare-changes.outputs.workflowsDisable && jobs.compare-changes.outputs.backendDisable && jobs.compare-changes.outputs.frontendDisable }} From b1cecb1819ed09b9d2d35996f14bf332a0b07f33 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 13:58:41 +1300 Subject: [PATCH 28/50] Changed logic that triggers workflows --- .github/workflows/backend-workflow.yml | 2 +- .github/workflows/frontend-workflow.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index 3daa756..55990a0 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -20,7 +20,7 @@ jobs: backend-tests: needs: - Compare-changes - if: ${{ needs.Compare-changes.outputs.backendDisable == 'false' }} + if: ${{ !needs.Compare-changes.outputs.backendDisable }} runs-on: ubuntu-latest steps: - name: Checkout code diff --git a/.github/workflows/frontend-workflow.yml b/.github/workflows/frontend-workflow.yml index 9845cb8..bc92443 100644 --- a/.github/workflows/frontend-workflow.yml +++ b/.github/workflows/frontend-workflow.yml @@ -18,7 +18,7 @@ jobs: frontend-test: needs: - Compare-changes - if: ${{ needs.Compare-changes.outputs.backendDisable == 'false' }} + if: ${{ !needs.Compare-changes.outputs.backendDisable }} runs-on: ubuntu-latest defaults: run: From fc5e1ce10ab2651e67a20c1b96b323cb28b8398b Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 14:03:05 +1300 Subject: [PATCH 29/50] Changed logic that triggers workflows --- .github/workflows/backend-workflow.yml | 2 +- .github/workflows/frontend-workflow.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index 55990a0..fa1f3d7 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -20,7 +20,7 @@ jobs: backend-tests: needs: - Compare-changes - if: ${{ !needs.Compare-changes.outputs.backendDisable }} + if: ${{ needs.Compare-changes.outputs.backendDisable == false }} runs-on: ubuntu-latest steps: - name: Checkout code diff --git a/.github/workflows/frontend-workflow.yml b/.github/workflows/frontend-workflow.yml index bc92443..465e677 100644 --- a/.github/workflows/frontend-workflow.yml +++ b/.github/workflows/frontend-workflow.yml @@ -18,7 +18,7 @@ jobs: frontend-test: needs: - Compare-changes - if: ${{ !needs.Compare-changes.outputs.backendDisable }} + if: ${{ needs.Compare-changes.outputs.backendDisable == false }} runs-on: ubuntu-latest defaults: run: From 2f4b0e9150b79ffe2b36336971b1785360f606c8 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 14:13:06 +1300 Subject: [PATCH 30/50] Changed logic that triggers workflows --- .github/workflows/backend-workflow.yml | 7 +++++++ .github/workflows/frontend-workflow.yml | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index fa1f3d7..a7fbdfb 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -17,6 +17,13 @@ jobs: - run: printf "backendDisable ${{ needs.Compare-changes.outputs.backendDisable == 'true' }}\n" printf "playwrightDisable ${{ needs.Compare-changes.outputs.playwrightDisable == 'true' }}" + skip-backend-test: + needs: + - Compare-changes + if: ${{ needs.Compare-changes.outputs.backendDisable == true }} + runs-on: ubuntu-latest + steps: + - run: echo "Skipping frontend tests" backend-tests: needs: - Compare-changes diff --git a/.github/workflows/frontend-workflow.yml b/.github/workflows/frontend-workflow.yml index 465e677..d594abc 100644 --- a/.github/workflows/frontend-workflow.yml +++ b/.github/workflows/frontend-workflow.yml @@ -15,10 +15,17 @@ jobs: - run: echo "FrontendDisable ${{ needs.compare-changes.outputs.frontendDisable }}" - run: printf "should run frontend CI ${{ needs.compare-changes.outputs.frontendDisable == 'false' }}\n" + skip-frontend-test: + needs: + - Compare-changes + if: ${{ needs.Compare-changes.outputs.frontendDisable == true }} + runs-on: ubuntu-latest + steps: + - run: echo "Skipping frontend tests" frontend-test: needs: - Compare-changes - if: ${{ needs.Compare-changes.outputs.backendDisable == false }} + if: ${{ needs.Compare-changes.outputs.frontendDisable == false }} runs-on: ubuntu-latest defaults: run: From 91738d10fdaa173b6e596f9cba94bac269d2a752 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 14:16:41 +1300 Subject: [PATCH 31/50] Changed logic that triggers workflows --- .github/workflows/backend-workflow.yml | 12 ++++++------ .github/workflows/frontend-workflow.yml | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index a7fbdfb..bf6c837 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -6,12 +6,12 @@ on: - "master" jobs: - Compare-changes: + compare-changes: uses: ./.github/workflows/compare-changes.yml print-compare-changes-output: runs-on: ubuntu-latest - needs: Compare-changes + needs: compare-changes steps: - run: echo "BackendDisable ${{ needs.compare-changes.outputs.backendDisable }}" - run: printf "backendDisable ${{ needs.Compare-changes.outputs.backendDisable == 'true' }}\n" @@ -19,15 +19,15 @@ jobs: skip-backend-test: needs: - - Compare-changes - if: ${{ needs.Compare-changes.outputs.backendDisable == true }} + - compare-changes + if: ${{ needs.compare-changes.outputs.backendDisable == true }} runs-on: ubuntu-latest steps: - run: echo "Skipping frontend tests" backend-tests: needs: - - Compare-changes - if: ${{ needs.Compare-changes.outputs.backendDisable == false }} + - compare-changes + if: ${{ needs.compare-changes.outputs.backendDisable == false }} runs-on: ubuntu-latest steps: - name: Checkout code diff --git a/.github/workflows/frontend-workflow.yml b/.github/workflows/frontend-workflow.yml index d594abc..e295d88 100644 --- a/.github/workflows/frontend-workflow.yml +++ b/.github/workflows/frontend-workflow.yml @@ -17,15 +17,15 @@ jobs: skip-frontend-test: needs: - - Compare-changes - if: ${{ needs.Compare-changes.outputs.frontendDisable == true }} + - compare-changes + if: ${{ needs.compare-changes.outputs.frontendDisable == true }} runs-on: ubuntu-latest steps: - run: echo "Skipping frontend tests" frontend-test: needs: - - Compare-changes - if: ${{ needs.Compare-changes.outputs.frontendDisable == false }} + - compare-changes + if: ${{ needs.compare-changes.outputs.frontendDisable == false }} runs-on: ubuntu-latest defaults: run: From f285fd036b53fbbae6673efe8382363ab5a1d496 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 14:23:00 +1300 Subject: [PATCH 32/50] Changed logic that triggers workflows --- .github/workflows/frontend-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/frontend-workflow.yml b/.github/workflows/frontend-workflow.yml index e295d88..f41efa0 100644 --- a/.github/workflows/frontend-workflow.yml +++ b/.github/workflows/frontend-workflow.yml @@ -18,10 +18,10 @@ jobs: skip-frontend-test: needs: - compare-changes - if: ${{ needs.compare-changes.outputs.frontendDisable == true }} runs-on: ubuntu-latest steps: - - run: echo "Skipping frontend tests" + - run: echo "Skipping frontend tests ${{ needs.compare-changes.outputs.frontendDisable }}" + echo "Skipping backend tests ${{ needs.compare-changes.outputs.backendDisable }}" frontend-test: needs: - compare-changes From aa6baa6699c0ee6589699ad85179043c6828ae7b Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 14:24:45 +1300 Subject: [PATCH 33/50] Changed logic that triggers workflows --- .github/workflows/frontend-workflow.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/frontend-workflow.yml b/.github/workflows/frontend-workflow.yml index f41efa0..ab20b31 100644 --- a/.github/workflows/frontend-workflow.yml +++ b/.github/workflows/frontend-workflow.yml @@ -21,7 +21,9 @@ jobs: runs-on: ubuntu-latest steps: - run: echo "Skipping frontend tests ${{ needs.compare-changes.outputs.frontendDisable }}" + echo ${{ needs.compare-changes.outputs.frontendDisable == false }} echo "Skipping backend tests ${{ needs.compare-changes.outputs.backendDisable }}" + echo ${{ needs.compare-changes.outputs.backendDisable == false }} frontend-test: needs: - compare-changes From 8b0df47700eb4fb1b9c87de1037f0e40cc91cf8f Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 14:26:42 +1300 Subject: [PATCH 34/50] Changed logic that triggers workflows --- .github/workflows/frontend-workflow.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/frontend-workflow.yml b/.github/workflows/frontend-workflow.yml index ab20b31..8264453 100644 --- a/.github/workflows/frontend-workflow.yml +++ b/.github/workflows/frontend-workflow.yml @@ -21,9 +21,11 @@ jobs: runs-on: ubuntu-latest steps: - run: echo "Skipping frontend tests ${{ needs.compare-changes.outputs.frontendDisable }}" - echo ${{ needs.compare-changes.outputs.frontendDisable == false }} + echo ${{ !needs.compare-changes.outputs.frontendDisable }} + echo ${{ needs.compare-changes.outputs.frontendDisable == 'false' }} echo "Skipping backend tests ${{ needs.compare-changes.outputs.backendDisable }}" - echo ${{ needs.compare-changes.outputs.backendDisable == false }} + echo ${{ needs.compare-changes.outputs.backendDisable == true }} + echo ${{ needs.compare-changes.outputs.backendDisable == 'true' }} frontend-test: needs: - compare-changes From 03e1a9e467ca39e09e52fbbaaf6a292fe224e1a7 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 14:30:13 +1300 Subject: [PATCH 35/50] Changed logic that triggers workflows --- .github/workflows/frontend-workflow.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/frontend-workflow.yml b/.github/workflows/frontend-workflow.yml index 8264453..72a6eb6 100644 --- a/.github/workflows/frontend-workflow.yml +++ b/.github/workflows/frontend-workflow.yml @@ -22,6 +22,7 @@ jobs: steps: - run: echo "Skipping frontend tests ${{ needs.compare-changes.outputs.frontendDisable }}" echo ${{ !needs.compare-changes.outputs.frontendDisable }} + echo ${{ needs.compare-changes.outputs.frontendDisable == false }} echo ${{ needs.compare-changes.outputs.frontendDisable == 'false' }} echo "Skipping backend tests ${{ needs.compare-changes.outputs.backendDisable }}" echo ${{ needs.compare-changes.outputs.backendDisable == true }} @@ -29,7 +30,7 @@ jobs: frontend-test: needs: - compare-changes - if: ${{ needs.compare-changes.outputs.frontendDisable == false }} + if: ${{ !needs.compare-changes.outputs.frontendDisable }} runs-on: ubuntu-latest defaults: run: From 1f8904d4b5526827d8d838c2f81e816f1d4290aa Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 14:49:52 +1300 Subject: [PATCH 36/50] Changed logic that triggers workflows --- .github/workflows/frontend-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/frontend-workflow.yml b/.github/workflows/frontend-workflow.yml index 72a6eb6..5ff9be3 100644 --- a/.github/workflows/frontend-workflow.yml +++ b/.github/workflows/frontend-workflow.yml @@ -30,7 +30,7 @@ jobs: frontend-test: needs: - compare-changes - if: ${{ !needs.compare-changes.outputs.frontendDisable }} + if: ${{ needs.compare-changes.outputs.frontendDisable == 'false' }} runs-on: ubuntu-latest defaults: run: From 659246488d63a81e2a4997a31bc52ca2b787747f Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 14:56:02 +1300 Subject: [PATCH 37/50] Changed logic that triggers workflows --- .github/workflows/backend-workflow.yml | 7 +++---- .github/workflows/frontend-workflow.yml | 7 +------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index bf6c837..fb12792 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -15,19 +15,18 @@ jobs: steps: - run: echo "BackendDisable ${{ needs.compare-changes.outputs.backendDisable }}" - run: printf "backendDisable ${{ needs.Compare-changes.outputs.backendDisable == 'true' }}\n" - printf "playwrightDisable ${{ needs.Compare-changes.outputs.playwrightDisable == 'true' }}" skip-backend-test: needs: - compare-changes - if: ${{ needs.compare-changes.outputs.backendDisable == true }} + if: ${{ needs.compare-changes.outputs.backendDisable == 'true' }} runs-on: ubuntu-latest steps: - - run: echo "Skipping frontend tests" + - run: echo "Skipping backend tests" backend-tests: needs: - compare-changes - if: ${{ needs.compare-changes.outputs.backendDisable == false }} + if: ${{ needs.compare-changes.outputs.backendDisable == 'false' }} runs-on: ubuntu-latest steps: - name: Checkout code diff --git a/.github/workflows/frontend-workflow.yml b/.github/workflows/frontend-workflow.yml index 5ff9be3..d962a74 100644 --- a/.github/workflows/frontend-workflow.yml +++ b/.github/workflows/frontend-workflow.yml @@ -18,15 +18,10 @@ jobs: skip-frontend-test: needs: - compare-changes + if: ${{ needs.compare-changes.outputs.frontendDisable == 'true' }} runs-on: ubuntu-latest steps: - run: echo "Skipping frontend tests ${{ needs.compare-changes.outputs.frontendDisable }}" - echo ${{ !needs.compare-changes.outputs.frontendDisable }} - echo ${{ needs.compare-changes.outputs.frontendDisable == false }} - echo ${{ needs.compare-changes.outputs.frontendDisable == 'false' }} - echo "Skipping backend tests ${{ needs.compare-changes.outputs.backendDisable }}" - echo ${{ needs.compare-changes.outputs.backendDisable == true }} - echo ${{ needs.compare-changes.outputs.backendDisable == 'true' }} frontend-test: needs: - compare-changes From da078be817a2063eb2925debe9356fce9962a338 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 15:06:50 +1300 Subject: [PATCH 38/50] Changed logic that triggers workflows --- .github/workflows/compare-changes.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml index a67faea..5a2a247 100644 --- a/.github/workflows/compare-changes.yml +++ b/.github/workflows/compare-changes.yml @@ -3,9 +3,9 @@ on: workflow_call: outputs: backendDisable: - value: ${{ jobs.compare-changes.outputs.backendDisable }} + value: ${{ jobs.compare-changes.outputs.backendDisable && jobs.compare-changes.outputs.workflowsDisable }} frontendDisable: - value: ${{ jobs.compare-changes.outputs.frontendDisable }} + value: ${{ jobs.compare-changes.outputs.frontendDisable && jobs.compare-changes.outputs.workflowsDisable }} playwrightDisable: value: ${{ jobs.compare-changes.outputs.playwrightDisable && jobs.compare-changes.outputs.workflowsDisable && jobs.compare-changes.outputs.backendDisable && jobs.compare-changes.outputs.frontendDisable }} @@ -19,7 +19,7 @@ jobs: backendDisable: ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'backend') }} frontendDisable: ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') }} playwrightDisable: ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'playwright') }} - workflowsNotChanged: ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') }} + workflowsDisable: ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') }} steps: - name: Checkout code uses: actions/checkout@v2 From ba082abd60cf54038678c1f88efea681b43d05ca Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 15:08:44 +1300 Subject: [PATCH 39/50] Changed logic that triggers workflows --- .github/workflows/backend-workflow.yml | 9 +-------- .github/workflows/frontend-workflow.yml | 7 ------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index fb12792..5630b72 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -14,15 +14,8 @@ jobs: needs: compare-changes steps: - run: echo "BackendDisable ${{ needs.compare-changes.outputs.backendDisable }}" - - run: printf "backendDisable ${{ needs.Compare-changes.outputs.backendDisable == 'true' }}\n" + - run: printf "should run frontend CI ${{ needs.Compare-changes.outputs.backendDisable == 'false' }}\n" - skip-backend-test: - needs: - - compare-changes - if: ${{ needs.compare-changes.outputs.backendDisable == 'true' }} - runs-on: ubuntu-latest - steps: - - run: echo "Skipping backend tests" backend-tests: needs: - compare-changes diff --git a/.github/workflows/frontend-workflow.yml b/.github/workflows/frontend-workflow.yml index d962a74..be2ba74 100644 --- a/.github/workflows/frontend-workflow.yml +++ b/.github/workflows/frontend-workflow.yml @@ -15,13 +15,6 @@ jobs: - run: echo "FrontendDisable ${{ needs.compare-changes.outputs.frontendDisable }}" - run: printf "should run frontend CI ${{ needs.compare-changes.outputs.frontendDisable == 'false' }}\n" - skip-frontend-test: - needs: - - compare-changes - if: ${{ needs.compare-changes.outputs.frontendDisable == 'true' }} - runs-on: ubuntu-latest - steps: - - run: echo "Skipping frontend tests ${{ needs.compare-changes.outputs.frontendDisable }}" frontend-test: needs: - compare-changes From 1bb704f2dce618a1a3a3d8a206ec2edef18d07d9 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 15:10:30 +1300 Subject: [PATCH 40/50] Revert FE changes --- web/src/App.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/App.tsx b/web/src/App.tsx index 1b26734..d2e9b61 100644 --- a/web/src/App.tsx +++ b/web/src/App.tsx @@ -3,7 +3,7 @@ import {BrowserRouter, Link, Route, Routes} from "react-router-dom"; import TitleSearch from "./TitleSearch"; import {TitlePage} from "./components/TitlePage"; -// FE CHanges + function App() { return (
From 623a1d7d014cf3da09235395e34fa152fd9d0dc4 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 15:13:27 +1300 Subject: [PATCH 41/50] FE CHanges --- web/src/App.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/App.tsx b/web/src/App.tsx index d2e9b61..1b26734 100644 --- a/web/src/App.tsx +++ b/web/src/App.tsx @@ -3,7 +3,7 @@ import {BrowserRouter, Link, Route, Routes} from "react-router-dom"; import TitleSearch from "./TitleSearch"; import {TitlePage} from "./components/TitlePage"; - +// FE CHanges function App() { return (
From 2a402f76febdc70cb3b43635bfff90eb514c1d24 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 15:30:13 +1300 Subject: [PATCH 42/50] Ignore Workflow changes --- .github/workflows/backend-workflow.yml | 3 ++- .github/workflows/compare-changes.yml | 10 ++++++---- .github/workflows/frontend-workflow.yml | 3 ++- web/src/App.tsx | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index 5630b72..6685e02 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -14,7 +14,8 @@ jobs: needs: compare-changes steps: - run: echo "BackendDisable ${{ needs.compare-changes.outputs.backendDisable }}" - - run: printf "should run frontend CI ${{ needs.Compare-changes.outputs.backendDisable == 'false' }}\n" + echo "workflowsDisable ${{ needs.compare-changes.outputs.workflowsDisable }}" + - run: printf "should run frontend CI ${{ needs.Compare-changes.outputs.backendDisable == 'false' || needs.compare-changes.outputs.workflowsDisable == 'false' }}\n" backend-tests: needs: diff --git a/.github/workflows/compare-changes.yml b/.github/workflows/compare-changes.yml index 5a2a247..7d7552f 100644 --- a/.github/workflows/compare-changes.yml +++ b/.github/workflows/compare-changes.yml @@ -3,11 +3,13 @@ on: workflow_call: outputs: backendDisable: - value: ${{ jobs.compare-changes.outputs.backendDisable && jobs.compare-changes.outputs.workflowsDisable }} + value: ${{ jobs.compare-changes.outputs.backendDisable }} frontendDisable: - value: ${{ jobs.compare-changes.outputs.frontendDisable && jobs.compare-changes.outputs.workflowsDisable }} + value: ${{ jobs.compare-changes.outputs.frontendDisable }} + workflowsDisable: + value: ${{ jobs.compare-changes.outputs.workflowsDisable }} playwrightDisable: - value: ${{ jobs.compare-changes.outputs.playwrightDisable && jobs.compare-changes.outputs.workflowsDisable && jobs.compare-changes.outputs.backendDisable && jobs.compare-changes.outputs.frontendDisable }} + value: ${{ jobs.compare-changes.outputs.playwrightDisable && jobs.compare-changes.outputs.backendDisable && jobs.compare-changes.outputs.frontendDisable }} jobs: compare-changes: @@ -32,7 +34,7 @@ jobs: echo "backend disabled ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'backend') }}\n" echo "frontend disabled ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'frontend') }}" echo "playwright disabled ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'playwright') }}" - echo "workflows changed ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') }}" + echo "workflows disabled ${{ !contains(fromJSON(steps.changed-files.outputs.changes), 'workflows') }}" - name: Check for both frontend and backend changes if: ${{ contains(fromJSON(steps.changed-files.outputs.changes), 'backend') && contains(fromJSON(steps.changed-files.outputs.changes), 'frontend')}} diff --git a/.github/workflows/frontend-workflow.yml b/.github/workflows/frontend-workflow.yml index be2ba74..268db58 100644 --- a/.github/workflows/frontend-workflow.yml +++ b/.github/workflows/frontend-workflow.yml @@ -13,7 +13,8 @@ jobs: needs: compare-changes steps: - run: echo "FrontendDisable ${{ needs.compare-changes.outputs.frontendDisable }}" - - run: printf "should run frontend CI ${{ needs.compare-changes.outputs.frontendDisable == 'false' }}\n" + echo "workflowsDisable ${{ needs.compare-changes.outputs.workflowsDisable }}" + - run: printf "should run frontend CI ${{ needs.compare-changes.outputs.frontendDisable == 'false' || needs.compare-changes.outputs.workflowsDisable == 'false' }}\n" frontend-test: needs: diff --git a/web/src/App.tsx b/web/src/App.tsx index 1b26734..d2e9b61 100644 --- a/web/src/App.tsx +++ b/web/src/App.tsx @@ -3,7 +3,7 @@ import {BrowserRouter, Link, Route, Routes} from "react-router-dom"; import TitleSearch from "./TitleSearch"; import {TitlePage} from "./components/TitlePage"; -// FE CHanges + function App() { return (
From cc2a604fbb868c8836e9161f7f98aaf098ea4ede Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 15:34:07 +1300 Subject: [PATCH 43/50] FE Changes --- web/src/App.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/App.tsx b/web/src/App.tsx index d2e9b61..1b26734 100644 --- a/web/src/App.tsx +++ b/web/src/App.tsx @@ -3,7 +3,7 @@ import {BrowserRouter, Link, Route, Routes} from "react-router-dom"; import TitleSearch from "./TitleSearch"; import {TitlePage} from "./components/TitlePage"; - +// FE CHanges function App() { return (
From b87b0c7a2044f95a90a0799d9c8baa8f871db29e Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 15:37:40 +1300 Subject: [PATCH 44/50] FE Changes --- .github/workflows/backend-workflow.yml | 4 ++-- .github/workflows/frontend-workflow.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index 6685e02..f06251e 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -15,12 +15,12 @@ jobs: steps: - run: echo "BackendDisable ${{ needs.compare-changes.outputs.backendDisable }}" echo "workflowsDisable ${{ needs.compare-changes.outputs.workflowsDisable }}" - - run: printf "should run frontend CI ${{ needs.Compare-changes.outputs.backendDisable == 'false' || needs.compare-changes.outputs.workflowsDisable == 'false' }}\n" + - run: printf "should run frontend CI - ${{ needs.Compare-changes.outputs.backendDisable == 'false' || needs.compare-changes.outputs.workflowsDisable == 'false' }}\n" backend-tests: needs: - compare-changes - if: ${{ needs.compare-changes.outputs.backendDisable == 'false' }} + if: ${{ needs.compare-changes.outputs.backendDisable == 'false' || needs.compare-changes.outputs.workflowsDisable == 'false' }} runs-on: ubuntu-latest steps: - name: Checkout code diff --git a/.github/workflows/frontend-workflow.yml b/.github/workflows/frontend-workflow.yml index 268db58..55988d0 100644 --- a/.github/workflows/frontend-workflow.yml +++ b/.github/workflows/frontend-workflow.yml @@ -14,12 +14,12 @@ jobs: steps: - run: echo "FrontendDisable ${{ needs.compare-changes.outputs.frontendDisable }}" echo "workflowsDisable ${{ needs.compare-changes.outputs.workflowsDisable }}" - - run: printf "should run frontend CI ${{ needs.compare-changes.outputs.frontendDisable == 'false' || needs.compare-changes.outputs.workflowsDisable == 'false' }}\n" + - run: printf "should run frontend CI - ${{ needs.compare-changes.outputs.frontendDisable == 'false' || needs.compare-changes.outputs.workflowsDisable == 'false' }}\n" frontend-test: needs: - compare-changes - if: ${{ needs.compare-changes.outputs.frontendDisable == 'false' }} + if: ${{ needs.compare-changes.outputs.frontendDisable == 'false' || needs.compare-changes.outputs.workflowsDisable == 'false' }} runs-on: ubuntu-latest defaults: run: From a5457e25e24123722f3b63dcef27bb3f905c118d Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 15:39:34 +1300 Subject: [PATCH 45/50] Revert FE Changes --- web/src/App.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/App.tsx b/web/src/App.tsx index 1b26734..d2e9b61 100644 --- a/web/src/App.tsx +++ b/web/src/App.tsx @@ -3,7 +3,7 @@ import {BrowserRouter, Link, Route, Routes} from "react-router-dom"; import TitleSearch from "./TitleSearch"; import {TitlePage} from "./components/TitlePage"; -// FE CHanges + function App() { return (
From 1b29474a0648fe33695161459a3d9c69cb339614 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 15:41:26 +1300 Subject: [PATCH 46/50] Typo --- .github/workflows/backend-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-workflow.yml b/.github/workflows/backend-workflow.yml index f06251e..240d569 100644 --- a/.github/workflows/backend-workflow.yml +++ b/.github/workflows/backend-workflow.yml @@ -15,7 +15,7 @@ jobs: steps: - run: echo "BackendDisable ${{ needs.compare-changes.outputs.backendDisable }}" echo "workflowsDisable ${{ needs.compare-changes.outputs.workflowsDisable }}" - - run: printf "should run frontend CI - ${{ needs.Compare-changes.outputs.backendDisable == 'false' || needs.compare-changes.outputs.workflowsDisable == 'false' }}\n" + - run: printf "should run backend CI - ${{ needs.Compare-changes.outputs.backendDisable == 'false' || needs.compare-changes.outputs.workflowsDisable == 'false' }}\n" backend-tests: needs: From 33b368ca4ac2781224627e607aa350ef1a90e54b Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 15:43:06 +1300 Subject: [PATCH 47/50] Typo --- web/src/App.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/App.tsx b/web/src/App.tsx index d2e9b61..1b26734 100644 --- a/web/src/App.tsx +++ b/web/src/App.tsx @@ -3,7 +3,7 @@ import {BrowserRouter, Link, Route, Routes} from "react-router-dom"; import TitleSearch from "./TitleSearch"; import {TitlePage} from "./components/TitlePage"; - +// FE CHanges function App() { return (
From 3be1c102a0d28b6c63c3b7994eccb7ef7c149539 Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 15:45:17 +1300 Subject: [PATCH 48/50] BE Changes --- .../kotlin/nz/govt/linz/landonlite/LandOnLiteApplication.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/nz/govt/linz/landonlite/LandOnLiteApplication.kt b/src/main/kotlin/nz/govt/linz/landonlite/LandOnLiteApplication.kt index 5d39dbf..2bc3123 100644 --- a/src/main/kotlin/nz/govt/linz/landonlite/LandOnLiteApplication.kt +++ b/src/main/kotlin/nz/govt/linz/landonlite/LandOnLiteApplication.kt @@ -2,7 +2,7 @@ package nz.govt.linz.landonlite import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication - +// BE Changes @SpringBootApplication class LandOnLiteApplication { } From fef66cc66d36d3d11a93ee5749d13484ee0d5d0b Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 15:46:09 +1300 Subject: [PATCH 49/50] Revert FE Changes --- web/src/App.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/App.tsx b/web/src/App.tsx index 1b26734..d2e9b61 100644 --- a/web/src/App.tsx +++ b/web/src/App.tsx @@ -3,7 +3,7 @@ import {BrowserRouter, Link, Route, Routes} from "react-router-dom"; import TitleSearch from "./TitleSearch"; import {TitlePage} from "./components/TitlePage"; -// FE CHanges + function App() { return (
From ab6ccf59c2917949ea23b88f73be35bf01c88b1e Mon Sep 17 00:00:00 2001 From: Christiano Gontijo Date: Tue, 12 Nov 2024 15:47:19 +1300 Subject: [PATCH 50/50] Revert BE Changes --- .../kotlin/nz/govt/linz/landonlite/LandOnLiteApplication.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/nz/govt/linz/landonlite/LandOnLiteApplication.kt b/src/main/kotlin/nz/govt/linz/landonlite/LandOnLiteApplication.kt index 2bc3123..5d39dbf 100644 --- a/src/main/kotlin/nz/govt/linz/landonlite/LandOnLiteApplication.kt +++ b/src/main/kotlin/nz/govt/linz/landonlite/LandOnLiteApplication.kt @@ -2,7 +2,7 @@ package nz.govt.linz.landonlite import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication -// BE Changes + @SpringBootApplication class LandOnLiteApplication { }