Skip to content

Commit

Permalink
Update Code Q integrations
Browse files Browse the repository at this point in the history
  • Loading branch information
workshur committed Mar 17, 2021
1 parent 3cab34d commit a6173f0
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 53 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
name: backend
on:
pull_request:
branches:
- "master"
paths-ignore:
- 'kafka-ui-react-app/**'
push:
branches:
- "**"
- "!master"
branches-ignore:
- 'master'
paths-ignore:
- 'kafka-ui-react-app/**'
jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -33,4 +34,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'java', 'javascript' ]
language: [ 'javascript' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
Expand Down
55 changes: 21 additions & 34 deletions .github/workflows/frontend.yaml
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
name: frontend
on:
pull_request:
branches:
- "master"
paths:
- './kafka-ui-contract/**'
- './kafka-ui-react-app/**'
push:
branches:
- "**"
- "!master"
branches-ignore:
- 'master'
paths:
- './kafka-ui-contract/**'
- './kafka-ui-react-app/**'
jobs:
npm-test:
needs: [mvn-contract-build]
env:
CI: true
NODE_ENV: dev
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
# Disabling shallow clone is recommended for improving relevancy of reporting
fetch-depth: 0
- name: Use Node.js
uses: actions/setup-node@v1
with:
node-version: "14"
- uses: actions/download-artifact@v2
with:
name: generated-sources
path: kafka-ui-react-app/src/generated-sources
- name: Cache node dependency
uses: actions/cache@v1
with:
Expand All @@ -35,6 +36,10 @@ jobs:
run: |
cd kafka-ui-react-app/
npm install
- name: Generate sources
run: |
cd kafka-ui-react-app/
npm run gen:sources
- name: Linter
run: |
cd kafka-ui-react-app/
Expand All @@ -43,28 +48,10 @@ jobs:
run: |
cd kafka-ui-react-app/
npm run test
mvn-contract-build:
runs-on: ubuntu-latest
steps:
- name: Cache local Maven repository
uses: actions/cache@v1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-contract-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-contract-
${{ runner.os }}-maven-
- uses: actions/checkout@v2
- name: Set up JDK 1.13
uses: actions/setup-java@v1
with:
java-version: 1.13
- name: Build with Maven
run: |
cd kafka-ui-contract
mvn clean package
- uses: actions/upload-artifact@v2
- name: SonarCloud Scan
uses: workshur/sonarcloud-github-action@improved_basedir
with:
name: generated-sources
path: kafka-ui-contract/target/generated-sources/frontend
projectBaseDir: ./kafka-ui-react-app
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_FRONTEND }}
4 changes: 4 additions & 0 deletions kafka-ui-react-app/sonar-project.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
sonar.projectKey=provectus_kafka-ui_frontend
sonar.organization=provectus

sonar.sources=./src
12 changes: 0 additions & 12 deletions sonar-project.properties

This file was deleted.

0 comments on commit a6173f0

Please sign in to comment.