Skip to content

Commit 3081095

Browse files
authored
Merge branch 'main' into dependabot/github_actions/github-actions-4f2694f5c5
2 parents 709f492 + 78f89c2 commit 3081095

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,23 @@ name: Build
22
on:
33
push:
44
branches:
5-
- master
5+
- main
66
- "1.6"
77
paths-ignore:
88
- "README.md"
99
- "release-notes/*"
1010
pull_request:
1111
branches:
12-
- master
12+
- main
1313
- "1.6"
1414
permissions:
1515
contents: read
1616
jobs:
1717
build:
18-
runs-on: 'ubuntu-22.04'
18+
runs-on: 'ubuntu-latest'
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
# Alas, JDK14 can't be yet used while build is for Java 6
2322
java_version: ['8', '11', '17']
2423
env:
2524
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
@@ -34,12 +33,12 @@ jobs:
3433
- name: Build
3534
run: ./mvnw -B -ff -ntp clean verify
3635
- name: Generate code coverage
37-
if: github.event_name != 'pull_request' && matrix.java_version == '8'
36+
if: ${{ github.event_name != 'pull_request' && matrix.java_version == '8' }}
3837
run: ./mvnw -B -q -ff -ntp test
3938
- name: Publish code coverage
40-
if: github.event_name != 'pull_request' && matrix.java_version == '8'
39+
if: ${{ github.event_name != 'pull_request' && matrix.java_version == '8' }}
4140
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
4241
with:
4342
token: ${{ secrets.CODECOV_TOKEN }}
44-
file: ./target/site/jacoco/jacoco.xml
43+
files: ./target/site/jacoco/jacoco.xml
4544
flags: unittests

VERSION.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ Java ClassMate project: licensed under Apache License 2.0
33

44
Release notes:
55

6+
1.7.1 (not yet released)
7+
8+
- Branch "master" renamed as "main"
9+
610
1.7.0 (02-Jan-2024)
711

812
#51: `TypeResolver.resolve(Long[].class)` should not return a `ResolvedType`

0 commit comments

Comments
 (0)