Skip to content

Commit

Permalink
Merge branch 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
yhtMinceraft1010X committed May 3, 2022
2 parents 1a08344 + b12d348 commit 605fe46
Show file tree
Hide file tree
Showing 248 changed files with 3,912 additions and 1,951 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
uses: actions/checkout@v2

- name: Set up Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: '12.x'
node-version: '14.x'

- name: Set up Node caching
uses: actions/cache@v2
Expand Down
87 changes: 78 additions & 9 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ jobs:
run: echo -e "Actual JDK in use -- "; java -version

- name: Set up Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: '12.x'
node-version: '14.x'

- name: Set up Gradle caching
uses: actions/cache@v2
Expand Down Expand Up @@ -67,11 +67,15 @@ jobs:
run: ./gradlew lintFrontend

- name: Build with Gradle
run: time ./gradlew clean checkstyleMain checkstyleTest test systemTest coverage
run: ./gradlew clean checkstyleAll test systemTest coverage

- name: Run code coverage
if: ${{ success() && matrix.os == 'ubuntu-20.04' }}
run: bash <(curl -s https://codecov.io/bash)
uses: codecov/codecov-action@v2
with:
directory: ${{ github.workspace }}/build/reports/jacoco/coverage
files: coverage.xml
fail_ci_if_error: true

- name: Build preview website (pull request)
if: ${{ success() && github.event_name == 'pull_request' && matrix.os == 'ubuntu-20.04' }}
Expand Down Expand Up @@ -121,9 +125,9 @@ jobs:
run: echo -e "Actual JDK in use -- "; java -version

- name: Set up Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: '12.x'
node-version: '14.x'

- name: Set up Gradle caching
uses: actions/cache@v2
Expand Down Expand Up @@ -153,7 +157,72 @@ jobs:
run: ./gradlew lintFrontend

- name: Build with Gradle
run: time ./gradlew clean checkstyleMain checkstyleTest test systemTest coverage
run: ./gradlew clean checkstyleAll test systemTest coverage

- name: Run code coverage
if: ${{ success() && matrix.os == 'macos-11' }}
uses: codecov/codecov-action@v2
with:
directory: ${{ github.workspace }}/build/reports/jacoco/coverage
files: coverage.xml
fail_ci_if_error: true

windows:
name: ${{ matrix.os }} JDK 8
strategy:
matrix:
os: [windows-2022, windows-2019]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8

- name: Verify Java version
run: Write-Output "Actual JDK in use -- "; java -version

- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: '14.x'

- name: Set up Gradle caching
uses: actions/cache@v2
with:
path: |
$HOME/.gradle/caches
$HOME/.gradle/wrapper
key: ${{ matrix.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ matrix.os }}-gradle-
- name: Set up Node caching
uses: actions/cache@v2
with:
path: $HOME/.npm
key: ${{ matrix.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ matrix.os }}-node-
- name: Run linter
run: ./gradlew lintFrontend

- name: Build with Gradle
run: ./gradlew clean checkstyleAll test systemTest coverage

- name: Run code coverage
if: ${{ success() && matrix.os == 'windows-2022' }}
uses: codecov/codecov-action@v2
with:
directory: ${{ github.workspace }}/build/reports/jacoco/coverage
files: coverage.xml
fail_ci_if_error: true

cypress:
name: Cypress frontend tests
Expand All @@ -174,9 +243,9 @@ jobs:
run: echo -e "Actual JDK in use -- "; java -version

- name: Set up Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: '12.x'
node-version: '14.x'

- name: Set up Gradle caching
uses: actions/cache@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/surge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ jobs:
uses: actions/checkout@v2

- name: Set up Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: '12.x'
node-version: '14.x'

- name: Download deployment artifacts
uses: dawidd6/action-download-artifact@v2
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# RepoSense

[![Build Status](https://github.com/reposense/RepoSense/actions/workflows/integration.yml/badge.svg)](https://github.com/reposense/RepoSense/actions/workflows/integration.yml)
[![Build status](https://ci.appveyor.com/api/projects/status/gsbkj5qby3pjd6nw/branch/master?svg=true)](https://ci.appveyor.com/project/eugenepeh/reposense/branch/master)
[![codecov.io](https://codecov.io/gh/reposense/RepoSense/branch/master/graphs/badge.svg?branch=master)](http://codecov.io/github/reposense/RepoSense?branch=master)
[![Netlify Status](https://api.netlify.com/api/v1/badges/260983b3-589e-4619-a2e8-0bfb7a2b4422/deploy-status)](https://app.netlify.com/sites/reposense/deploys)

Expand Down
18 changes: 0 additions & 18 deletions appveyor.yml

This file was deleted.

Loading

0 comments on commit 605fe46

Please sign in to comment.