Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
ckcherry23 committed May 7, 2023
2 parents 467872b + 50dd4ab commit 5cd529f
Show file tree
Hide file tree
Showing 210 changed files with 37,640 additions and 3,260 deletions.
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@ labels: "c.Bug"
Before opening a new issue, please search existing issues: https://github.com/reposense/RepoSense/issues
-->

**Tell us about your environment**
### Tell us about your environment

* **RepoSense Version:**
* **OS and Version:**
* **Web Browser and Version (if applicable):**


**Please include the steps to reproduce the bug.**
### Please include the steps to reproduce the bug.

1.
1.


**What was expected to happen?**
### What was expected to happen?


**What actually happened? Please include a screenshot of the output.**
### What actually happened? Please include a screenshot of the output.


**If possible, include the URL to your RepoSense report or log files (if any).**
### If possible, include the URL to your RepoSense report or log files (if any).

4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ labels: "a-Docs"
Before opening a new issue, please search existing issues: https://github.com/reposense/RepoSense/issues
-->

**What problem(s) did you run into that caused you to request additional documentation? What, if any, existing documentation relates to this proposal?**
### What problem(s) did you run into that caused you to request additional documentation? What, if any, existing documentation relates to this proposal?
<!--
Mention the part of the documentation you're referring to
and how it relates to your request.
-->


**What would you like added or modified in the documentation?**
### What would you like added or modified in the documentation?
<!--
Summarize the suggested addition to or
modification of existing documentation.
Expand Down
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,36 @@ labels: "c.Feature"
Before opening a new issue, please search existing issues: https://github.com/reposense/RepoSense/issues
-->

**What feature(s) would you like to see in RepoSense?**
### What feature(s) would you like to see in RepoSense
<!--
Provide a clear and concise description of the feature.
-->


**Is the feature request related to a problem?**
### Is the feature request related to a problem?

<!--
Provide a clear and concise description of what the problem is.
Ex. I have an issue when [...]
-->


**If possible, describe the solution**
### If possible, describe the solution

<!--
Here would be a good place to talk about the solution or the
approach that can be taken.
-->


**If applicable, describe alternatives you've considered**
### If applicable, describe alternatives you've considered

<!--
Let us know about other solutions you've tried or researched.
-->


**Additional context**
### Additional context

<!--
Is there anything else that can be added about the proposal?
Expand Down
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
-->
Fixes #xxxx

## Proposed commit message
### Proposed commit message
<!--
Propose a detailed commit message for this pull request within the triple backticks below.
Wrap lines at 72 characters.
Expand All @@ -28,9 +28,9 @@ Brief description of current behaviour and reason(s) for the change.
Call-to-action statement describing what you are doing in this PR.
```

## Other information
### Other information
<!--
Are there other relevant information, such as special testing instructions,
Are there other relevant information, such as special testing instructions,
which will help the reviewer better understand the code?
You may also include a brief description of why the problem occurred.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: '14.x'
node-version: '16.x'

- name: Set up Node caching
uses: actions/cache@v3
Expand Down
172 changes: 27 additions & 145 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,21 @@ on:
branches-ignore:
- gh-pages

env:
NODE_VER: '16.x'
JAVA_DISTRIBUTION: 'zulu'
JAVA_VER: 8

jobs:
ubuntu:
mainbuild:
name: ${{ matrix.os }} JDK 8
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, ubuntu-22.04]
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, windows-2019, windows-2022]
runs-on: ${{ matrix.os }}
env:
NODE_VERSION: "lts/*"
HOMEBREW_NO_AUTO_UPDATE: 1 # Prevent time-consuming brew update

steps:
- name: Checkout repository
Expand All @@ -29,40 +35,41 @@ jobs:
- name: Set up JDK 1.8
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 8
distribution: ${{ env.JAVA_DISTRIBUTION }}
java-version: ${{ env.JAVA_VER }}

- name: Verify Java version
run: echo -e "Actual JDK in use -- "; java -version
run: echo "Actual JDK in use -- "; java -version

- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: '14.x'
node-version: ${{ env.NODE_VER }}

- name: Set up Gradle caching
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
$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@v3
with:
path: ~/.npm
path: $HOME/.npm
key: ${{ matrix.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ matrix.os }}-node-
- name: Grant execute permission for gradlew
run: chmod +x gradlew
if: ${{ runner.os != 'Windows' }}
run: chmod +x gradlew # Windows does not need this

- name: Run environmental checks
run: ./config/gh-actions/run-checks.sh
run: ./gradlew environmentalChecks

- name: Run linter
run: ./gradlew lintFrontend
Expand All @@ -71,7 +78,7 @@ jobs:
run: ./gradlew clean checkstyleAll test systemTest coverage

- name: Run code coverage
if: ${{ success() && matrix.os == 'ubuntu-20.04' }}
if: ${{ success() && ( matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-11' || matrix.os == 'windows-2022' ) }}
uses: codecov/codecov-action@v3
with:
directory: ${{ github.workspace }}/build/reports/jacoco/coverage
Expand Down Expand Up @@ -102,131 +109,6 @@ jobs:
./docs/_site
./pr
macos:
name: ${{ matrix.os }} JDK 8
strategy:
matrix:
os: [macos-11, macos-12]
runs-on: ${{ matrix.os }}
env:
HOMEBREW_NO_AUTO_UPDATE: 1 # Prevent time-consuming brew update

steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Set up JDK 1.8
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 8

- name: Verify Java version
run: echo -e "Actual JDK in use -- "; java -version

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

- name: Set up Gradle caching
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ matrix.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ matrix.os }}-gradle-
- name: Set up Node caching
uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ matrix.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ matrix.os }}-node-
- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Run environmental checks
run: ./config/gh-actions/run-checks.sh

- 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 == 'macos-11' }}
uses: codecov/codecov-action@v3
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-2019, windows-2022]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Set up JDK 1.8
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 8

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

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

- name: Set up Gradle caching
uses: actions/cache@v3
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@v3
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@v3
with:
directory: ${{ github.workspace }}/build/reports/jacoco/coverage
files: coverage.xml
fail_ci_if_error: true

cypress:
name: Cypress frontend tests
runs-on: ubuntu-20.04
Expand All @@ -240,31 +122,31 @@ jobs:
- name: Set up JDK 1.8
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 8
distribution: ${{ env.JAVA_DISTRIBUTION }}
java-version: ${{ env.JAVA_VER }}

- name: Verify Java version
run: echo -e "Actual JDK in use -- "; java -version
run: echo "Actual JDK in use -- "; java -version

- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: '14.x'
node-version: ${{ env.NODE_VER }}

- name: Set up Gradle caching
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
$HOME/.gradle/caches
$HOME/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Set up Node caching
uses: actions/cache@v3
with:
path: ~/.npm
path: $HOME/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/surge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: '14.x'
node-version: '16.x'

- name: Download deployment artifacts
uses: dawidd6/action-download-artifact@v2
Expand All @@ -37,7 +37,7 @@ jobs:

- name: Extract PR number
id: pr-number
run: echo '::set-output name=ACTIONS_PR_NUMBER::'$(cat ./pr/NUMBER)
run: echo 'ACTIONS_PR_NUMBER='$(cat ./pr/NUMBER) >> $GITHUB_OUTPUT

- name: Download deployment status artifacts
uses: dawidd6/action-download-artifact@v2
Expand Down
Loading

0 comments on commit 5cd529f

Please sign in to comment.