From 55277326ff4af6eace7851a822d537a5780545cb Mon Sep 17 00:00:00 2001 From: Hannes Michalek Date: Mon, 16 Dec 2024 10:23:27 +0100 Subject: [PATCH] Enable pipeline for branches --- .github/workflows/frontend-jobs.yml | 106 ++++++++++++++-------------- .github/workflows/pipeline.yml | 3 +- 2 files changed, 55 insertions(+), 54 deletions(-) diff --git a/.github/workflows/frontend-jobs.yml b/.github/workflows/frontend-jobs.yml index d0a85e1..7f22e4b 100644 --- a/.github/workflows/frontend-jobs.yml +++ b/.github/workflows/frontend-jobs.yml @@ -106,62 +106,62 @@ jobs: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} # # -# Disabled as these got stuck somehow -# -# e2e-tests-frontend: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v4 -# - name: Setup Node -# uses: actions/setup-node@v4 -# with: -# node-version-file: ./frontend/package.json -# cache: npm -# cache-dependency-path: ./frontend/package-lock.json -# - name: Cache node_modules -# uses: actions/cache@v4 -# id: node-modules-cache -# with: -# path: | -# ./frontend/node_modules -# key: modules-${{ hashFiles('./frontend/package-lock.json') }} -# - name: Install dependencies -# if: steps.node-modules-cache.outputs.cache-hit != 'true' -# run: | -# npm ci -# working-directory: ./frontend -# - name: Get Playwright version -# working-directory: ./frontend -# run: echo "PLAYWRIGHT_VERSION=$(jq -r '.packages["node_modules/@playwright/test"].version' package-lock.json)" >> $GITHUB_ENV -# - name: Cache browser binaries -# id: cache-browser-binaries -# uses: actions/cache@v4 -# with: -# path: ~/.cache/ms-playwright -# key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }} -# - name: Install playwright browsers -# if: steps.cache-browser-binaries.outputs.cache-hit != 'true' -# run: | -# npx --yes playwright install --with-deps -# - name: e2e tests -# run: | -# npm run test:e2e -# working-directory: ./frontend -# # TODO: enable later -# # -# # - name: Send status to Slack -# # # Third-party action, pin to commit SHA! -# # # See https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions -# # uses: digitalservicebund/notify-on-failure-gha@814d0c4b2ad6a3443e89c991f8657b10126510bf # v1.5.0 -# # if: ${{ failure() && github.ref == 'refs/heads/main' }} -# # with: -# # SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} -# -# + # Disabled as these got stuck somehow + # + # e2e-tests-frontend: + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v4 + # - name: Setup Node + # uses: actions/setup-node@v4 + # with: + # node-version-file: ./frontend/package.json + # cache: npm + # cache-dependency-path: ./frontend/package-lock.json + # - name: Cache node_modules + # uses: actions/cache@v4 + # id: node-modules-cache + # with: + # path: | + # ./frontend/node_modules + # key: modules-${{ hashFiles('./frontend/package-lock.json') }} + # - name: Install dependencies + # if: steps.node-modules-cache.outputs.cache-hit != 'true' + # run: | + # npm ci + # working-directory: ./frontend + # - name: Get Playwright version + # working-directory: ./frontend + # run: echo "PLAYWRIGHT_VERSION=$(jq -r '.packages["node_modules/@playwright/test"].version' package-lock.json)" >> $GITHUB_ENV + # - name: Cache browser binaries + # id: cache-browser-binaries + # uses: actions/cache@v4 + # with: + # path: ~/.cache/ms-playwright + # key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }} + # - name: Install playwright browsers + # if: steps.cache-browser-binaries.outputs.cache-hit != 'true' + # run: | + # npx --yes playwright install --with-deps + # - name: e2e tests + # run: | + # npm run test:e2e + # working-directory: ./frontend + # # TODO: enable later + # # + # # - name: Send status to Slack + # # # Third-party action, pin to commit SHA! + # # # See https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions + # # uses: digitalservicebund/notify-on-failure-gha@814d0c4b2ad6a3443e89c991f8657b10126510bf # v1.5.0 + # # if: ${{ failure() && github.ref == 'refs/heads/main' }} + # # with: + # # SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} + # + # check-code-quality-with-sonarqube: needs: scan-frontend-changes - # enable the below + # TODO: enable the below # if: ${{ github.ref == 'refs/heads/main' }} runs-on: ubuntu-latest steps: diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index c188a62..9d41ddb 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -6,7 +6,8 @@ on: paths-ignore: - "**/*.md" pull_request: - branches: [main] + # TODO: restrict later + # branches: [main] # Allow to run this workflow manually workflow_dispatch: