From a1817d43c99392124dc6b92989f70a0107a79714 Mon Sep 17 00:00:00 2001 From: "Sebastian BURGIN-FIX (ext)" Date: Tue, 30 Jun 2026 14:26:07 +0200 Subject: [PATCH] wip --- .github/workflows/assets_production.yml | 12 ++++++------ .github/workflows/dependabot-auto-merge.yml | 2 +- .github/workflows/larastan_pull_request.yml | 8 ++++---- .github/workflows/pest_coverage_pull_request.yml | 10 +++++----- .github/workflows/pest_pull_request.yml | 10 +++++----- .github/workflows/release.yml | 2 +- lang/de_CH.json | 1 - lang/en_CH.json | 1 - resources/views/components/next.blade.php | 9 --------- tests/Feature/Controllers/MatrixWellKnownTest.php | 1 + 10 files changed, 23 insertions(+), 33 deletions(-) delete mode 100644 resources/views/components/next.blade.php diff --git a/.github/workflows/assets_production.yml b/.github/workflows/assets_production.yml index a6bd786..563b054 100644 --- a/.github/workflows/assets_production.yml +++ b/.github/workflows/assets_production.yml @@ -12,14 +12,14 @@ jobs: env: PHP_VERSION: 8.4 - NODE_VERSION: 22 + NODE_VERSION: 24 steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Setup Node.js environment - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: node-version: ${{ env.NODE_VERSION }} @@ -33,7 +33,7 @@ jobs: run: cp .env.ci .env - name: Cache Composer dependencies - uses: actions/cache@v4 + uses: actions/cache@v6 with: path: ~/.composer/cache key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} @@ -43,7 +43,7 @@ jobs: run: composer install --no-progress --prefer-dist --no-interaction --optimize-autoloader - name: Cache node_modules - uses: actions/cache@v4 + uses: actions/cache@v6 with: path: ~/.npm key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} @@ -76,7 +76,7 @@ jobs: name: production | deploy steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: fetch-depth: '0' diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 27c23a4..ed73fd2 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -13,7 +13,7 @@ jobs: - name: Dependabot metadata id: metadata - uses: dependabot/fetch-metadata@v2.2.0 + uses: dependabot/fetch-metadata@v3 with: github-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/larastan_pull_request.yml b/.github/workflows/larastan_pull_request.yml index 54e98ff..f14e7bb 100644 --- a/.github/workflows/larastan_pull_request.yml +++ b/.github/workflows/larastan_pull_request.yml @@ -9,11 +9,11 @@ jobs: env: PHP_VERSION: 8.4 - NODE_VERSION: 22 + NODE_VERSION: 24 steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Setup PHP Environment uses: shivammathur/setup-php@v2 @@ -25,7 +25,7 @@ jobs: run: cp .env.ci .env - name: Cache Composer Dependencies - uses: actions/cache@v4 + uses: actions/cache@v6 with: path: | ~/.composer/cache/files @@ -45,7 +45,7 @@ jobs: - name: Store Log Artifacts if: failure() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: Store report artifacts path: ./storage/logs diff --git a/.github/workflows/pest_coverage_pull_request.yml b/.github/workflows/pest_coverage_pull_request.yml index cf6afb3..0e9df18 100644 --- a/.github/workflows/pest_coverage_pull_request.yml +++ b/.github/workflows/pest_coverage_pull_request.yml @@ -9,13 +9,13 @@ jobs: env: PHP_VERSION: 8.4 - NODE_VERSION: 22 + NODE_VERSION: 24 PEST_MIN_COVERAGE: 1 PEST_MIN_TYPE_COVERAGE: 1 steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Setup PHP Environment uses: shivammathur/setup-php@v2 @@ -28,7 +28,7 @@ jobs: run: cp .env.ci .env - name: Cache Composer Dependencies - uses: actions/cache@v4 + uses: actions/cache@v6 with: path: | ~/.composer/cache/files @@ -55,7 +55,7 @@ jobs: php artisan migrate:fresh - name: Setup Node.js Environment - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: node-version: ${{ env.NODE_VERSION }} cache: 'npm' @@ -77,7 +77,7 @@ jobs: - name: Store Log Artifacts if: failure() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: Store report artifacts path: ./storage/logs diff --git a/.github/workflows/pest_pull_request.yml b/.github/workflows/pest_pull_request.yml index 752ffcd..e8891f9 100644 --- a/.github/workflows/pest_pull_request.yml +++ b/.github/workflows/pest_pull_request.yml @@ -9,11 +9,11 @@ jobs: env: PHP_VERSION: 8.4 - NODE_VERSION: 22 + NODE_VERSION: 24 steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Setup PHP Environment uses: shivammathur/setup-php@v2 @@ -25,7 +25,7 @@ jobs: run: cp .env.ci .env - name: Cache Composer Dependencies - uses: actions/cache@v4 + uses: actions/cache@v6 with: path: | ~/.composer/cache/files @@ -51,7 +51,7 @@ jobs: php artisan migrate:fresh - name: Setup Node.js Environment - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: node-version: ${{ env.NODE_VERSION }} cache: 'npm' @@ -67,7 +67,7 @@ jobs: - name: Store Log Artifacts if: failure() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: Store report artifacts path: ./storage/logs diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5349193..038967b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: name: Release runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: fetch-depth: '0' - name: Bump version and push tag diff --git a/lang/de_CH.json b/lang/de_CH.json index cd028fb..55bae4d 100644 --- a/lang/de_CH.json +++ b/lang/de_CH.json @@ -28,7 +28,6 @@ "Last updated at: :date": "Zuletzt aktualisiert am: :date", "Legal": "Rechtliches", "Locations": "Standorte", - "Next": "Weiter", "Media": "Medien", "Media intro": "Offizielle codebar-Logos für Presse und Partner.", "Logos": "Logos", diff --git a/lang/en_CH.json b/lang/en_CH.json index f711539..36c3409 100644 --- a/lang/en_CH.json +++ b/lang/en_CH.json @@ -26,7 +26,6 @@ "Last updated at: :date": "Last updated at: :date", "Legal": "Legal", "Locations": "Locations", - "Next": "Next", "Media": "Media", "Media intro": "Download official codebar logos for press and partner use.", "Logos": "Logos", diff --git a/resources/views/components/next.blade.php b/resources/views/components/next.blade.php deleted file mode 100644 index ef1a37a..0000000 --- a/resources/views/components/next.blade.php +++ /dev/null @@ -1,9 +0,0 @@ -@if ($configuration?->key === '_codebar') - - -
- - -
- -@endif diff --git a/tests/Feature/Controllers/MatrixWellKnownTest.php b/tests/Feature/Controllers/MatrixWellKnownTest.php index d184927..6ed6f6e 100644 --- a/tests/Feature/Controllers/MatrixWellKnownTest.php +++ b/tests/Feature/Controllers/MatrixWellKnownTest.php @@ -15,6 +15,7 @@ ->assertOk() ->assertExactJson([ 'm.homeserver' => ['base_url' => 'https://connect.codebar.ch'], + 'm.identity_server' => ['base_url' => 'https://vector.im'], ]) ->assertHeader('Access-Control-Allow-Origin', '*'); });