From ff9c31d4da898705ba2b5d6a5ec899f1d97c6bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=8F=94=EF=B8=8F=20Peak?= <122374094+peaklabs-dev@users.noreply.github.com> Date: Thu, 24 Apr 2025 20:48:54 +0200 Subject: [PATCH] Chore: Adjust Workflows for v5 (#5689) * chore(workflows): remove unsued workflow * chore(workflows): rename branches in workflows * fix(license): update copyright year * chore(workflows): update branches to ignore in staging build workflow * chore(workflows): update branch references in issue processing and changelog generation --------- Co-authored-by: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com> --- .github/workflows/browser-tests.yml | 65 ------------------- ...e-remove-labels-and-assignees-on-close.yml | 4 +- .github/workflows/coolify-helper.yml | 2 +- .../workflows/coolify-production-build.yml | 2 +- .github/workflows/coolify-realtime.yml | 2 +- .github/workflows/coolify-staging-build.yml | 4 +- .github/workflows/generate-changelog.yml | 4 +- LICENSE | 2 +- 8 files changed, 10 insertions(+), 75 deletions(-) delete mode 100644 .github/workflows/browser-tests.yml diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml deleted file mode 100644 index b06c9e97c..000000000 --- a/.github/workflows/browser-tests.yml +++ /dev/null @@ -1,65 +0,0 @@ -name: Dusk -on: - push: - branches: [ "not-existing" ] -jobs: - dusk: - runs-on: ubuntu-latest - - services: - redis: - image: redis - env: - REDIS_HOST: localhost - REDIS_PORT: 6379 - ports: - - 6379:6379 - options: >- - --health-cmd "redis-cli ping" - --health-interval 10s - --health-timeout 5s - --health-retries 5 - - steps: - - uses: actions/checkout@v4 - - name: Set up PostgreSQL - run: | - sudo systemctl start postgresql - sudo -u postgres psql -c "CREATE DATABASE coolify;" - sudo -u postgres psql -c "CREATE USER coolify WITH PASSWORD 'password';" - sudo -u postgres psql -c "ALTER ROLE coolify SET client_encoding TO 'utf8';" - sudo -u postgres psql -c "ALTER ROLE coolify SET default_transaction_isolation TO 'read committed';" - sudo -u postgres psql -c "ALTER ROLE coolify SET timezone TO 'UTC';" - sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE coolify TO coolify;" - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: '8.2' - - name: Copy .env - run: cp .env.dusk.ci .env - - name: Install Dependencies - run: composer install --no-progress --prefer-dist --optimize-autoloader - - name: Generate key - run: php artisan key:generate - - name: Install Chrome binaries - run: php artisan dusk:chrome-driver --detect - - name: Start Chrome Driver - run: ./vendor/laravel/dusk/bin/chromedriver-linux --port=4444 & - - name: Build assets - run: npm install && npm run build - - name: Run Laravel Server - run: php artisan serve --no-reload & - - name: Execute tests - run: php artisan dusk - - name: Upload Screenshots - if: failure() - uses: actions/upload-artifact@v4 - with: - name: screenshots - path: tests/Browser/screenshots - - name: Upload Console Logs - if: failure() - uses: actions/upload-artifact@v4 - with: - name: console - path: tests/Browser/console diff --git a/.github/workflows/chore-remove-labels-and-assignees-on-close.yml b/.github/workflows/chore-remove-labels-and-assignees-on-close.yml index a3c299b5e..194984ddc 100644 --- a/.github/workflows/chore-remove-labels-and-assignees-on-close.yml +++ b/.github/workflows/chore-remove-labels-and-assignees-on-close.yml @@ -21,7 +21,7 @@ jobs: async function processIssue(issueNumber, isFromPR = false, prBaseBranch = null) { try { - if (isFromPR && prBaseBranch !== 'main') { + if (isFromPR && prBaseBranch !== 'v4.x') { return; } @@ -70,7 +70,7 @@ jobs: if (context.eventName === 'pull_request' || context.eventName === 'pull_request_target') { const pr = context.payload.pull_request; await processIssue(pr.number); - if (pr.merged && pr.base.ref === 'main' && pr.body) { + if (pr.merged && pr.base.ref === 'v4.x' && pr.body) { const issueReferences = pr.body.match(/#(\d+)/g); if (issueReferences) { for (const reference of issueReferences) { diff --git a/.github/workflows/coolify-helper.yml b/.github/workflows/coolify-helper.yml index 78c888a01..56c3eaa17 100644 --- a/.github/workflows/coolify-helper.yml +++ b/.github/workflows/coolify-helper.yml @@ -2,7 +2,7 @@ name: Coolify Helper Image on: push: - branches: [ "main" ] + branches: [ "v4.x" ] paths: - .github/workflows/coolify-helper.yml - docker/coolify-helper/Dockerfile diff --git a/.github/workflows/coolify-production-build.yml b/.github/workflows/coolify-production-build.yml index ad0878205..cd1f002b8 100644 --- a/.github/workflows/coolify-production-build.yml +++ b/.github/workflows/coolify-production-build.yml @@ -2,7 +2,7 @@ name: Production Build (v4) on: push: - branches: ["main"] + branches: ["v4.x"] paths-ignore: - .github/workflows/coolify-helper.yml - .github/workflows/coolify-helper-next.yml diff --git a/.github/workflows/coolify-realtime.yml b/.github/workflows/coolify-realtime.yml index d3af14144..d00621cc2 100644 --- a/.github/workflows/coolify-realtime.yml +++ b/.github/workflows/coolify-realtime.yml @@ -2,7 +2,7 @@ name: Coolify Realtime on: push: - branches: [ "main" ] + branches: [ "v4.x" ] paths: - .github/workflows/coolify-realtime.yml - docker/coolify-realtime/Dockerfile diff --git a/.github/workflows/coolify-staging-build.yml b/.github/workflows/coolify-staging-build.yml index 17f4cba8b..09b1e9421 100644 --- a/.github/workflows/coolify-staging-build.yml +++ b/.github/workflows/coolify-staging-build.yml @@ -3,8 +3,8 @@ name: Staging Build on: push: branches-ignore: - - main - - v3 + - v4.x + - v3.x - '**v5.x**' paths-ignore: - .github/workflows/coolify-helper.yml diff --git a/.github/workflows/generate-changelog.yml b/.github/workflows/generate-changelog.yml index ee5af6b3d..935a88721 100644 --- a/.github/workflows/generate-changelog.yml +++ b/.github/workflows/generate-changelog.yml @@ -2,7 +2,7 @@ name: Generate Changelog on: push: - branches: [ main ] + branches: [ v4.x ] workflow_dispatch: permissions: @@ -33,4 +33,4 @@ jobs: git config user.email 'github-actions[bot]@users.noreply.github.com' git add CHANGELOG.md git commit -m "docs: update changelog" - git push https://${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git main + git push https://${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git v4.x diff --git a/LICENSE b/LICENSE index 86c87eba2..e3cc59461 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [2022] [Andras Bacsai] + Copyright [2025] [Andras Bacsai] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.