From 6b3e0323c5225711738799850898e723c2206d66 Mon Sep 17 00:00:00 2001 From: bernard-ng Date: Mon, 6 Oct 2025 17:46:13 +0200 Subject: [PATCH] fix: github actions --- .../audit.yaml => backend_audit.yaml} | 21 +++++++++++-------- .../deploy.yaml => backend_deploy.yaml} | 17 +++++++++------ .../quality.yaml => backend_quality.yaml} | 20 ++++++++++-------- .../tests.yaml => backend_tests.yaml} | 12 +++++++---- .../{crawler/audit.yml => crawler_audit.yml} | 11 +++++++--- .../quality.yml => crawler_quality.yml} | 14 ++++++------- .../{crawler/tests.yml => crawler_tests.yml} | 14 ++++++------- .../quality.yaml => mobile_quality.yaml} | 16 +++++++------- 8 files changed, 72 insertions(+), 53 deletions(-) rename .github/workflows/{backend/audit.yaml => backend_audit.yaml} (82%) rename .github/workflows/{backend/deploy.yaml => backend_deploy.yaml} (78%) rename .github/workflows/{backend/quality.yaml => backend_quality.yaml} (83%) rename .github/workflows/{backend/tests.yaml => backend_tests.yaml} (90%) rename .github/workflows/{crawler/audit.yml => crawler_audit.yml} (81%) rename .github/workflows/{crawler/quality.yml => crawler_quality.yml} (87%) rename .github/workflows/{crawler/tests.yml => crawler_tests.yml} (87%) rename .github/workflows/{mobile/quality.yaml => mobile_quality.yaml} (87%) diff --git a/.github/workflows/backend/audit.yaml b/.github/workflows/backend_audit.yaml similarity index 82% rename from .github/workflows/backend/audit.yaml rename to .github/workflows/backend_audit.yaml index 37eb764..19d74c6 100644 --- a/.github/workflows/backend/audit.yaml +++ b/.github/workflows/backend_audit.yaml @@ -1,4 +1,8 @@ -name: audit +name: backend audit +defaults: + run: + working-directory: projects/backend + on: workflow_call: push: @@ -6,19 +10,17 @@ on: - main paths: - "projects/backend/**" - - ".github/workflows/backend/**" + - ".github/workflows/backend_*.yaml" pull_request: branches-ignore: - main paths: - "projects/backend/**" - - ".github/workflows/backend/**" -defaults: - run: - working-directory: projects/backend + - ".github/workflows/backend_*.yaml" + jobs: audit: - name: Security Audit + name: composer audit runs-on: ubuntu-latest steps: - name: Checkout @@ -37,9 +39,9 @@ jobs: uses: actions/cache@v4 with: path: ${{ env.COMPOSER_CACHE_DIR }} - key: php8.3-composer-${{ hashFiles('projects/backend/composer.lock') }} + key: php8.4-composer-${{ hashFiles('projects/backend/composer.lock') }} restore-keys: | - php8.3-composer-latest- + php8.4-composer-latest- - name: Update composer run: composer self-update @@ -49,3 +51,4 @@ jobs: - name: Security Audit with composer run: composer audit continue-on-error: true + diff --git a/.github/workflows/backend/deploy.yaml b/.github/workflows/backend_deploy.yaml similarity index 78% rename from .github/workflows/backend/deploy.yaml rename to .github/workflows/backend_deploy.yaml index 51e7e00..df1a781 100644 --- a/.github/workflows/backend/deploy.yaml +++ b/.github/workflows/backend_deploy.yaml @@ -1,22 +1,26 @@ -name: deploy +name: backend deploy +defaults: + run: + working-directory: projects/backend + on: push: branches: - main paths: - "projects/backend/**" - - ".github/workflows/backend/**" + - ".github/workflows/backend_*.yaml" jobs: audit: - uses: ./.github/workflows/backend/audit.yaml + uses: ./.github/workflows/backend_audit.yaml quality: - uses: ./.github/workflows/backend/quality.yaml + uses: ./.github/workflows/backend_quality.yaml tests: - uses: ./.github/workflows/backend/tests.yaml + uses: ./.github/workflows/backend_tests.yaml needs: [audit, quality] deploy: - name: Deploy + name: deploy needs: [tests] runs-on: ubuntu-latest steps: @@ -38,3 +42,4 @@ jobs: "text": "news.devscast.tech : `'"$(git rev-parse --short HEAD)"'` has been deployed! 🎉", "parse_mode": "Markdown" }' + diff --git a/.github/workflows/backend/quality.yaml b/.github/workflows/backend_quality.yaml similarity index 83% rename from .github/workflows/backend/quality.yaml rename to .github/workflows/backend_quality.yaml index d637f02..ceca7df 100644 --- a/.github/workflows/backend/quality.yaml +++ b/.github/workflows/backend_quality.yaml @@ -1,4 +1,8 @@ -name: quality +name: backend quality +defaults: + run: + working-directory: projects/backend + on: workflow_call: push: @@ -6,20 +10,17 @@ on: - main paths: - "projects/backend/**" - - ".github/workflows/backend/**" + - ".github/workflows/backend_*.yaml" pull_request: branches-ignore: - main paths: - "projects/backend/**" - - ".github/workflows/backend/**" + - ".github/workflows/backend_*.yaml" -defaults: - run: - working-directory: projects/backend jobs: quality: - name: Quality + name: quality runs-on: ubuntu-latest steps: - name: Checkout @@ -38,9 +39,9 @@ jobs: uses: actions/cache@v4 with: path: ${{ env.COMPOSER_CACHE_DIR }} - key: php8.3-composer-${{ hashFiles('projects/backend/composer.lock') }} + key: php8.4-composer-${{ hashFiles('projects/backend/composer.lock') }} restore-keys: | - php8.3-composer-latest- + php8.4-composer-latest- - name: Update composer run: composer self-update @@ -49,3 +50,4 @@ jobs: - name: Run code quality analysis run: composer app:cs + diff --git a/.github/workflows/backend/tests.yaml b/.github/workflows/backend_tests.yaml similarity index 90% rename from .github/workflows/backend/tests.yaml rename to .github/workflows/backend_tests.yaml index 04c3990..5de2e2a 100644 --- a/.github/workflows/backend/tests.yaml +++ b/.github/workflows/backend_tests.yaml @@ -1,4 +1,8 @@ -name: tests +name: backend tests +defaults: + run: + working-directory: projects/backend + on: workflow_call: push: @@ -6,16 +10,16 @@ on: - main paths: - "projects/backend/**" - - ".github/workflows/backend/**" + - ".github/workflows/backend_*.yaml" pull_request: branches-ignore: - main paths: - "projects/backend/**" - - ".github/workflows/backend/**" + - ".github/workflows/backend_*.yaml" jobs: functional: - name: Functional Tests + name: phpunit runs-on: ubuntu-latest # services: # mysql: diff --git a/.github/workflows/crawler/audit.yml b/.github/workflows/crawler_audit.yml similarity index 81% rename from .github/workflows/crawler/audit.yml rename to .github/workflows/crawler_audit.yml index 6bf503c..1f0e4a8 100644 --- a/.github/workflows/crawler/audit.yml +++ b/.github/workflows/crawler_audit.yml @@ -1,4 +1,7 @@ -name: audit +name: crawler audit +defaults: + run: + working-directory: projects/crawler on: push: @@ -6,14 +9,15 @@ on: - main paths: - "projects/crawler/**" - - ".github/workflows/crawler/**" + - ".github/workflows/crawler_*.yml" pull_request: paths: - "projects/crawler/**" - - ".github/workflows/crawler/**" + - ".github/workflows/crawler_*.yml" jobs: bandit: + name: bandit runs-on: ubuntu-latest steps: @@ -38,3 +42,4 @@ jobs: - name: Run Bandit (security linter) run: uv run bandit -r . -c pyproject.toml || true + diff --git a/.github/workflows/crawler/quality.yml b/.github/workflows/crawler_quality.yml similarity index 87% rename from .github/workflows/crawler/quality.yml rename to .github/workflows/crawler_quality.yml index 0dca0c3..7ee4367 100644 --- a/.github/workflows/crawler/quality.yml +++ b/.github/workflows/crawler_quality.yml @@ -1,4 +1,7 @@ -name: quality +name: crawler quality +defaults: + run: + working-directory: projects/crawler on: push: @@ -6,18 +9,15 @@ on: - main paths: - "projects/crawler/**" - - ".github/workflows/crawler/**" + - ".github/workflows/crawler_*.yml" pull_request: paths: - "projects/crawler/**" - - ".github/workflows/crawler/**" - -defaults: - run: - working-directory: projects/crawler + - ".github/workflows/crawler_*.yml" jobs: lint: + name: ruff and pyright runs-on: ubuntu-latest steps: diff --git a/.github/workflows/crawler/tests.yml b/.github/workflows/crawler_tests.yml similarity index 87% rename from .github/workflows/crawler/tests.yml rename to .github/workflows/crawler_tests.yml index 99c4ade..239fa07 100644 --- a/.github/workflows/crawler/tests.yml +++ b/.github/workflows/crawler_tests.yml @@ -1,4 +1,7 @@ -name: tests +name: crawler tests +defaults: + run: + working-directory: projects/crawler on: push: @@ -6,18 +9,15 @@ on: - main paths: - "projects/crawler/**" - - ".github/workflows/crawler/**" + - ".github/workflows/crawler_*.yml" pull_request: paths: - "projects/crawler/**" - - ".github/workflows/crawler/**" - -defaults: - run: - working-directory: projects/crawler + - ".github/workflows/crawler_*.yml" jobs: test: + name: pytest runs-on: ubuntu-latest steps: diff --git a/.github/workflows/mobile/quality.yaml b/.github/workflows/mobile_quality.yaml similarity index 87% rename from .github/workflows/mobile/quality.yaml rename to .github/workflows/mobile_quality.yaml index 387b52e..8ffa3d0 100644 --- a/.github/workflows/mobile/quality.yaml +++ b/.github/workflows/mobile_quality.yaml @@ -1,22 +1,21 @@ -name: quality +name: mobile quality +defaults: + run: + working-directory: projects/mobile on: push: paths: - "projects/mobile/**" - - ".github/workflows/mobile/**" + - ".github/workflows/mobile_*.yaml" pull_request: paths: - "projects/mobile/**" - - ".github/workflows/mobile/**" - -defaults: - run: - working-directory: projects/mobile + - ".github/workflows/mobile_*.yaml" jobs: quality: - name: Quality + name: eslint and prettier runs-on: ubuntu-latest steps: @@ -49,3 +48,4 @@ jobs: bun run check-types bun run check bun run lint:check +