diff options
| author |  Kristóf Marussy <marussy@mit.bme.hu> | 2021-09-24 18:30:00 +0200 |
|---|---|---|
| committer | Kristóf Marussy <marussy@mit.bme.hu> | 2021-09-24 18:30:00 +0200 |
| commit | 90e4c39607f07323a6a84d9d82385732be754939 (patch) | |
| tree | 348ae0d809c57b3830dd6c0d06384dd9be150fe1 | |
| parent | ci: trying to fix build.yml (diff) | |
| download | refinery-90e4c39607f07323a6a84d9d82385732be754939.tar.gz refinery-90e4c39607f07323a6a84d9d82385732be754939.tar.zst refinery-90e4c39607f07323a6a84d9d82385732be754939.zip | |
ci: fix typo and simplify workflow
| -rw-r--r-- | .github/workflows/build.yml | 8 | ||||
| -rw-r--r-- | gradle/xtend.gradle | 2 | ||||
| -rw-r--r-- | gradle/xtext-common.gradle | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4b35fa5b..9c923182 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml | |||
| @@ -40,10 +40,8 @@ jobs: | |||
| 40 | **/node_modules | 40 | **/node_modules |
| 41 | key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }} | 41 | key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }} |
| 42 | restore-keys: ${{ runner.os }}-npm | 42 | restore-keys: ${{ runner.os }}-npm |
| 43 | - name: Gradle build | 43 | - name: Gradle build and Sonar analyze |
| 44 | run: ./gradlew build --info | ||
| 45 | - name: Sonar analyze | ||
| 46 | env: | 44 | env: |
| 47 | GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any | 45 | GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed by Sonar to get PR information, if any |
| 48 | SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} | 46 | SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} |
| 49 | run: ./gradlew sonarqube --info | 47 | run: ./gradlew build sonarqube --info |
diff --git a/gradle/xtend.gradle b/gradle/xtend.gradle index f8637a1f..b0a62d70 100644 --- a/gradle/xtend.gradle +++ b/gradle/xtend.gradle | |||
| @@ -15,7 +15,7 @@ clean.doLast { | |||
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | sonarqube.properties { | 17 | sonarqube.properties { |
| 18 | properties['sonar.exlusions'] += [ | 18 | properties['sonar.exclusions'] += [ |
| 19 | 'src/main/xtend-gen/**', | 19 | 'src/main/xtend-gen/**', |
| 20 | 'src/test/xtend-gen/**', | 20 | 'src/test/xtend-gen/**', |
| 21 | ] | 21 | ] |
diff --git a/gradle/xtext-common.gradle b/gradle/xtext-common.gradle index 9353b46f..f34108f3 100644 --- a/gradle/xtext-common.gradle +++ b/gradle/xtext-common.gradle | |||
| @@ -21,7 +21,7 @@ clean.doLast { | |||
| 21 | } | 21 | } |
| 22 | 22 | ||
| 23 | sonarqube.properties { | 23 | sonarqube.properties { |
| 24 | properties['sonar.exlusions'] += [ | 24 | properties['sonar.exclusions'] += [ |
| 25 | 'src/main/xtext-gen/**', | 25 | 'src/main/xtext-gen/**', |
| 26 | 'src/test/xtext-gen/**', | 26 | 'src/test/xtext-gen/**', |
| 27 | ] | 27 | ] |