Fix Sonar scan environment variable setup

Author: thomasturrell

.github/workflows/maven_pull_request.yml

@@ -21,12 +21,12 @@ jobs:
       - name: Build with Maven
         run: mvn -B verify --file pom.xml
       - name: Scan with Sonar
-        env:
-          FORK: ${{ github.event.pull_request.head.repo.fork }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}      
         run: |
           if [ $FORK = false ]
           then
             mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BerryCloud_xapi-java -Dsonar.organization=berrycloud --file pom.xml
           fi
+        env:
+          FORK: ${{ github.event.pull_request.head.repo.fork }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}