Skip to content

Commit 5cd529f

Browse files
committed
Merge branch 'master' into release
2 parents 467872b + 50dd4ab commit 5cd529f

File tree

210 files changed

+37640
-3260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

210 files changed

+37640
-3260
lines changed

.github/ISSUE_TEMPLATE/bug-report.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@ labels: "c.Bug"
88
Before opening a new issue, please search existing issues: https://github.com/reposense/RepoSense/issues
99
-->
1010

11-
**Tell us about your environment**
11+
### Tell us about your environment
1212

1313
* **RepoSense Version:**
1414
* **OS and Version:**
1515
* **Web Browser and Version (if applicable):**
1616

1717

18-
**Please include the steps to reproduce the bug.**
18+
### Please include the steps to reproduce the bug.
1919

2020
1.
2121
1.
2222

2323

24-
**What was expected to happen?**
24+
### What was expected to happen?
2525

2626

27-
**What actually happened? Please include a screenshot of the output.**
27+
### What actually happened? Please include a screenshot of the output.
2828

2929

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

.github/ISSUE_TEMPLATE/documentation.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ labels: "a-Docs"
88
Before opening a new issue, please search existing issues: https://github.com/reposense/RepoSense/issues
99
-->
1010

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

1717

18-
**What would you like added or modified in the documentation?**
18+
### What would you like added or modified in the documentation?
1919
<!--
2020
Summarize the suggested addition to or
2121
modification of existing documentation.

.github/ISSUE_TEMPLATE/feature-request.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,36 @@ labels: "c.Feature"
88
Before opening a new issue, please search existing issues: https://github.com/reposense/RepoSense/issues
99
-->
1010

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

1616

17-
**Is the feature request related to a problem?**
17+
### Is the feature request related to a problem?
1818

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

2424

25-
**If possible, describe the solution**
25+
### If possible, describe the solution
2626

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

3232

33-
**If applicable, describe alternatives you've considered**
33+
### If applicable, describe alternatives you've considered
3434

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

3939

40-
**Additional context**
40+
### Additional context
4141

4242
<!--
4343
Is there anything else that can be added about the proposal?

.github/PULL_REQUEST_TEMPLATE.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
-->
1515
Fixes #xxxx
1616

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

31-
## Other information
31+
### Other information
3232
<!--
33-
Are there other relevant information, such as special testing instructions,
33+
Are there other relevant information, such as special testing instructions,
3434
which will help the reviewer better understand the code?
3535
3636
You may also include a brief description of why the problem occurred.

.github/workflows/gh-pages.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up Node.js
2222
uses: actions/setup-node@v3
2323
with:
24-
node-version: '14.x'
24+
node-version: '16.x'
2525

2626
- name: Set up Node caching
2727
uses: actions/cache@v3

.github/workflows/integration.yml

+27-145
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,21 @@ on:
1010
branches-ignore:
1111
- gh-pages
1212

13+
env:
14+
NODE_VER: '16.x'
15+
JAVA_DISTRIBUTION: 'zulu'
16+
JAVA_VER: 8
17+
1318
jobs:
14-
ubuntu:
19+
mainbuild:
1520
name: ${{ matrix.os }} JDK 8
1621
strategy:
22+
fail-fast: false
1723
matrix:
18-
os: [ubuntu-20.04, ubuntu-22.04]
24+
os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, windows-2019, windows-2022]
1925
runs-on: ${{ matrix.os }}
2026
env:
21-
NODE_VERSION: "lts/*"
27+
HOMEBREW_NO_AUTO_UPDATE: 1 # Prevent time-consuming brew update
2228

2329
steps:
2430
- name: Checkout repository
@@ -29,40 +35,41 @@ jobs:
2935
- name: Set up JDK 1.8
3036
uses: actions/setup-java@v3
3137
with:
32-
distribution: 'zulu'
33-
java-version: 8
38+
distribution: ${{ env.JAVA_DISTRIBUTION }}
39+
java-version: ${{ env.JAVA_VER }}
3440

3541
- name: Verify Java version
36-
run: echo -e "Actual JDK in use -- "; java -version
42+
run: echo "Actual JDK in use -- "; java -version
3743

3844
- name: Set up Node.js
3945
uses: actions/setup-node@v3
4046
with:
41-
node-version: '14.x'
47+
node-version: ${{ env.NODE_VER }}
4248

4349
- name: Set up Gradle caching
4450
uses: actions/cache@v3
4551
with:
4652
path: |
47-
~/.gradle/caches
48-
~/.gradle/wrapper
53+
$HOME/.gradle/caches
54+
$HOME/.gradle/wrapper
4955
key: ${{ matrix.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
5056
restore-keys: |
5157
${{ matrix.os }}-gradle-
5258
5359
- name: Set up Node caching
5460
uses: actions/cache@v3
5561
with:
56-
path: ~/.npm
62+
path: $HOME/.npm
5763
key: ${{ matrix.os }}-node-${{ hashFiles('**/package-lock.json') }}
5864
restore-keys: |
5965
${{ matrix.os }}-node-
6066
6167
- name: Grant execute permission for gradlew
62-
run: chmod +x gradlew
68+
if: ${{ runner.os != 'Windows' }}
69+
run: chmod +x gradlew # Windows does not need this
6370

6471
- name: Run environmental checks
65-
run: ./config/gh-actions/run-checks.sh
72+
run: ./gradlew environmentalChecks
6673

6774
- name: Run linter
6875
run: ./gradlew lintFrontend
@@ -71,7 +78,7 @@ jobs:
7178
run: ./gradlew clean checkstyleAll test systemTest coverage
7279

7380
- name: Run code coverage
74-
if: ${{ success() && matrix.os == 'ubuntu-20.04' }}
81+
if: ${{ success() && ( matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-11' || matrix.os == 'windows-2022' ) }}
7582
uses: codecov/codecov-action@v3
7683
with:
7784
directory: ${{ github.workspace }}/build/reports/jacoco/coverage
@@ -102,131 +109,6 @@ jobs:
102109
./docs/_site
103110
./pr
104111
105-
macos:
106-
name: ${{ matrix.os }} JDK 8
107-
strategy:
108-
matrix:
109-
os: [macos-11, macos-12]
110-
runs-on: ${{ matrix.os }}
111-
env:
112-
HOMEBREW_NO_AUTO_UPDATE: 1 # Prevent time-consuming brew update
113-
114-
steps:
115-
- name: Checkout repository
116-
uses: actions/checkout@v3
117-
with:
118-
fetch-depth: 0
119-
120-
- name: Set up JDK 1.8
121-
uses: actions/setup-java@v3
122-
with:
123-
distribution: 'zulu'
124-
java-version: 8
125-
126-
- name: Verify Java version
127-
run: echo -e "Actual JDK in use -- "; java -version
128-
129-
- name: Set up Node.js
130-
uses: actions/setup-node@v3
131-
with:
132-
node-version: '14.x'
133-
134-
- name: Set up Gradle caching
135-
uses: actions/cache@v3
136-
with:
137-
path: |
138-
~/.gradle/caches
139-
~/.gradle/wrapper
140-
key: ${{ matrix.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
141-
restore-keys: |
142-
${{ matrix.os }}-gradle-
143-
144-
- name: Set up Node caching
145-
uses: actions/cache@v3
146-
with:
147-
path: ~/.npm
148-
key: ${{ matrix.os }}-node-${{ hashFiles('**/package-lock.json') }}
149-
restore-keys: |
150-
${{ matrix.os }}-node-
151-
152-
- name: Grant execute permission for gradlew
153-
run: chmod +x gradlew
154-
155-
- name: Run environmental checks
156-
run: ./config/gh-actions/run-checks.sh
157-
158-
- name: Run linter
159-
run: ./gradlew lintFrontend
160-
161-
- name: Build with Gradle
162-
run: ./gradlew clean checkstyleAll test systemTest coverage
163-
164-
- name: Run code coverage
165-
if: ${{ success() && matrix.os == 'macos-11' }}
166-
uses: codecov/codecov-action@v3
167-
with:
168-
directory: ${{ github.workspace }}/build/reports/jacoco/coverage
169-
files: coverage.xml
170-
fail_ci_if_error: true
171-
172-
windows:
173-
name: ${{ matrix.os }} JDK 8
174-
strategy:
175-
matrix:
176-
os: [windows-2019, windows-2022]
177-
runs-on: ${{ matrix.os }}
178-
steps:
179-
- name: Checkout repository
180-
uses: actions/checkout@v3
181-
with:
182-
fetch-depth: 0
183-
184-
- name: Set up JDK 1.8
185-
uses: actions/setup-java@v3
186-
with:
187-
distribution: 'zulu'
188-
java-version: 8
189-
190-
- name: Verify Java version
191-
run: Write-Output "Actual JDK in use -- "; java -version
192-
193-
- name: Set up Node.js
194-
uses: actions/setup-node@v3
195-
with:
196-
node-version: '14.x'
197-
198-
- name: Set up Gradle caching
199-
uses: actions/cache@v3
200-
with:
201-
path: |
202-
$HOME/.gradle/caches
203-
$HOME/.gradle/wrapper
204-
key: ${{ matrix.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
205-
restore-keys: |
206-
${{ matrix.os }}-gradle-
207-
208-
- name: Set up Node caching
209-
uses: actions/cache@v3
210-
with:
211-
path: $HOME/.npm
212-
key: ${{ matrix.os }}-node-${{ hashFiles('**/package-lock.json') }}
213-
restore-keys: |
214-
${{ matrix.os }}-node-
215-
216-
- name: Run linter
217-
run: ./gradlew lintFrontend
218-
219-
- name: Build with Gradle
220-
run: ./gradlew clean checkstyleAll test systemTest coverage
221-
222-
- name: Run code coverage
223-
if: ${{ success() && matrix.os == 'windows-2022' }}
224-
uses: codecov/codecov-action@v3
225-
with:
226-
directory: ${{ github.workspace }}/build/reports/jacoco/coverage
227-
files: coverage.xml
228-
fail_ci_if_error: true
229-
230112
cypress:
231113
name: Cypress frontend tests
232114
runs-on: ubuntu-20.04
@@ -240,31 +122,31 @@ jobs:
240122
- name: Set up JDK 1.8
241123
uses: actions/setup-java@v3
242124
with:
243-
distribution: 'zulu'
244-
java-version: 8
125+
distribution: ${{ env.JAVA_DISTRIBUTION }}
126+
java-version: ${{ env.JAVA_VER }}
245127

246128
- name: Verify Java version
247-
run: echo -e "Actual JDK in use -- "; java -version
129+
run: echo "Actual JDK in use -- "; java -version
248130

249131
- name: Set up Node.js
250132
uses: actions/setup-node@v3
251133
with:
252-
node-version: '14.x'
134+
node-version: ${{ env.NODE_VER }}
253135

254136
- name: Set up Gradle caching
255137
uses: actions/cache@v3
256138
with:
257139
path: |
258-
~/.gradle/caches
259-
~/.gradle/wrapper
140+
$HOME/.gradle/caches
141+
$HOME/.gradle/wrapper
260142
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
261143
restore-keys: |
262144
${{ runner.os }}-gradle-
263145
264146
- name: Set up Node caching
265147
uses: actions/cache@v3
266148
with:
267-
path: ~/.npm
149+
path: $HOME/.npm
268150
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
269151
restore-keys: |
270152
${{ runner.os }}-node-

.github/workflows/surge.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Set up Node.js
2626
uses: actions/setup-node@v3
2727
with:
28-
node-version: '14.x'
28+
node-version: '16.x'
2929

3030
- name: Download deployment artifacts
3131
uses: dawidd6/action-download-artifact@v2
@@ -37,7 +37,7 @@ jobs:
3737

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

4242
- name: Download deployment status artifacts
4343
uses: dawidd6/action-download-artifact@v2

0 commit comments

Comments
 (0)