From c37d6a65a7a683c3bc942da617c705ce61cae0ce Mon Sep 17 00:00:00 2001
From: Alexis Saettler <alexis@saettler.org>
Date: Mon, 30 Oct 2023 13:44:05 +0100
Subject: [PATCH] fix

---
 .github/workflows/docker.yml  |  1 -
 .github/workflows/push.yml    |  1 -
 .github/workflows/release.yml |  9 +++++----
 .github/workflows/tests.yml   | 12 +-----------
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a087a422a84..9fd03e16047 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - chandler
 
   workflow_dispatch:
 
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index e8ee0147161..a404ea40178 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - chandler
 
 jobs:
   build:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0185594ee0b..5dbece4fb1f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -94,17 +94,17 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
-            ${{ runner.os }}-composer-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
-            ${{ runner.os }}-composer-${{ matrix.php-version }}
+            ${{ runner.os }}-composer-${{ env.php-version }}-${{ hashFiles('**/composer.lock') }}
+            ${{ runner.os }}-composer-${{ env.php-version }}
             ${{ runner.os }}-composer-
 
       # Yarn
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node-version }}
+          node-version: ${{ env.build-node-version }}
       - name: Cache yarn files
         uses: actions/cache@v3
         with:
@@ -159,4 +159,5 @@ jobs:
         with:
           workflow: Release update
           repo: monicahq/docker
+          ref: refs/heads/main
           token: ${{ secrets.DOCKER_GITHUB_TOKEN }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5770b5d6963..fd59ac558bf 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - chandler
   pull_request:
     types: [opened, synchronize, reopened]
   release:
@@ -181,15 +180,6 @@ jobs:
           SONAR_COVERAGE=$(ls -m --format=comma results/${{ env.coverage-with }}/coverage/coverage*.xml | sed -e ':a;N;$!ba;s/\n//g; s/ //g;')
           echo "list=$SONAR_COVERAGE" >> $GITHUB_OUTPUT
 
-      - name: Set project key
-        id: projectkey
-        run: |
-          if [[ "${{ github.repository }}" == "monicahq/chandler" ]]; then
-            echo "value=monicahq_chandler" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.repository }}" == "monicahq/monica" ]]; then
-            echo "value=monica" >> $GITHUB_OUTPUT
-          fi
-
       - name: SonarCloud Scan
         if: env.SONAR_TOKEN != ''
         uses: SonarSource/sonarcloud-github-action@v2.0.2
@@ -198,7 +188,7 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         with:
           args: |
-            -Dsonar.projectKey=${{ steps.projectkey.outputs.value }}
+            -Dsonar.projectKey=monica
             -Dsonar.organization=monicahq
             -Dsonar.sources=app,bootstrap,config,database,public,resources,routes
             -Dsonar.exclusions=bootstrap/cache/*,public/vendor/**,resources/lang/**