Skip to content

Commit 698e3f0

Browse files
committed
build(github:actions): fix github actions
1 parent 775303b commit 698e3f0

File tree

8 files changed

+63
-31
lines changed

8 files changed

+63
-31
lines changed

.github/workflows/publish.yml

Lines changed: 37 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,25 @@ env:
1111
jobs:
1212
build:
1313
runs-on: ubuntu-latest
14+
permissions:
15+
contents: read
16+
packages: write
1417

1518
if: startsWith(github.event.head_commit.message, 'bumped version to ') != true
1619

1720
steps:
18-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v3
1922
with:
2023
fetch-depth: 0
2124

22-
- name: Set up JDK 1.8
23-
uses: actions/setup-java@v1
25+
- name: Set up JDK 17
26+
uses: actions/setup-java@v3.9.0
2427
with:
25-
java-version: 1.8
28+
java-version: 17
29+
distribution: 'temurin'
2630

2731
- name: Cache dependencies
28-
uses: actions/cache@v1
32+
uses: actions/cache@v3.2.2
2933
with:
3034
path: ~/.gradle/caches
3135
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
@@ -40,21 +44,25 @@ jobs:
4044
test:
4145
needs: [ build ]
4246
runs-on: ubuntu-latest
47+
permissions:
48+
contents: read
49+
packages: write
4350

4451
if: startsWith(github.event.head_commit.message, 'bumped version to ') != true
4552

4653
steps:
47-
- uses: actions/checkout@v2
54+
- uses: actions/checkout@v3
4855
with:
4956
fetch-depth: 0
5057

51-
- name: Set up JDK 1.8
52-
uses: actions/setup-java@v1
58+
- name: Set up JDK 17
59+
uses: actions/setup-java@v3.9.0
5360
with:
54-
java-version: 1.8
61+
java-version: 17
62+
distribution: 'temurin'
5563

5664
- name: Cache dependencies
57-
uses: actions/cache@v1
65+
uses: actions/cache@v3.2.2
5866
with:
5967
path: ~/.gradle/caches
6068
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
@@ -69,21 +77,25 @@ jobs:
6977
deploy_snapshot:
7078
needs: [ build, test ]
7179
runs-on: ubuntu-latest
80+
permissions:
81+
contents: read
82+
packages: write
7283

73-
if: (github.ref == 'refs/heads/master') && startsWith(github.event.head_commit.message, 'release:') != true
84+
if: (github.ref == 'refs/heads/main') && startsWith(github.event.head_commit.message, 'release:') != true
7485

7586
steps:
76-
- uses: actions/checkout@v2
87+
- uses: actions/checkout@v3
7788
with:
7889
fetch-depth: 0
7990

80-
- name: Set up JDK 1.8
81-
uses: actions/setup-java@v1
91+
- name: Set up JDK 17
92+
uses: actions/setup-java@v3.9.0
8293
with:
83-
java-version: 1.8
94+
java-version: 17
95+
distribution: 'temurin'
8496

8597
- name: Cache dependencies
86-
uses: actions/cache@v1
98+
uses: actions/cache@v3.2.2
8799
with:
88100
path: ~/.gradle/caches
89101
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
@@ -114,21 +126,25 @@ jobs:
114126
deploy_release:
115127
needs: [ build, test ]
116128
runs-on: ubuntu-latest
129+
permissions:
130+
contents: read
131+
packages: write
117132

118133
if: startsWith(github.ref, 'refs/tags/') && startsWith(github.event.head_commit.message, 'release')
119134

120135
steps:
121-
- uses: actions/checkout@v2
136+
- uses: actions/checkout@v3
122137
with:
123138
fetch-depth: 0
124139

125-
- name: Set up JDK 1.8
126-
uses: actions/setup-java@v1
140+
- name: Set up JDK 17
141+
uses: actions/setup-java@v3.9.0
127142
with:
128-
java-version: 1.8
143+
java-version: 17
144+
distribution: 'temurin'
129145

130146
- name: Cache dependencies
131-
uses: actions/cache@v1
147+
uses: actions/cache@v3.2.2
132148
with:
133149
path: ~/.gradle/caches
134150
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,20 @@
99

1010
### Chores
1111

12-
- **deps**: bumped spring version to 3.0.1 ([6c6f4521](https://github.com/ymind/rsql-querydsl/commit/6c6f4521f7833546c53dc9a29946101e779f0d84))
12+
- **deps**: bumped spring version to 3.0.1 ([a5d3da5f](https://github.com/ymind/rsql-querydsl/commit/a5d3da5f1571775184290553db4b47911d9de330))
13+
- no longer print stack trace when TypeNotSupportedException occurred ([1fd80544](https://github.com/ymind/rsql-querydsl/commit/1fd805446ba0522c679f84b633d0be9c617e4e80))
14+
15+
16+
### Styles
17+
18+
- code cleanup ([3e7152bc](https://github.com/ymind/rsql-querydsl/commit/3e7152bcaf1254bfd957ffa7ce61562320836f39))
1319

1420

1521
### Build System
1622

23+
- **github:actions**: fix github actions ([5864ee73](https://github.com/ymind/rsql-querydsl/commit/5864ee7376c1499ee346b791a59ccdee32c28537))
1724
- **gradle**: bumped gradle wrapper version to 7.5.1 ([fb6c22e7](https://github.com/ymind/rsql-querydsl/commit/fb6c22e7c1d8d5190580e9e7f38c7ea8cbd99463))
25+
- **gradle**: bumped gradle wrapper version to 7.6 ([775303b1](https://github.com/ymind/rsql-querydsl/commit/775303b1f79300eaf94668a08337164e2635fdd4))
1826
- **gradle:plugin**: remove ktlint plugin ([7cddf171](https://github.com/ymind/rsql-querydsl/commit/7cddf171994e046a53ba664c5d3ebbfb9f885054))
1927
- **gradle:plugin**: bumped io.gitlab.arturbosch.detekt version to 1.22.0 ([c07c4173](https://github.com/ymind/rsql-querydsl/commit/c07c4173ee567111d28840f65f505df8dfd9ebe8))
2028
- **gradle:plugin**: bumped com.github.ben-manes.versions version to 0.44.0 ([586c08e3](https://github.com/ymind/rsql-querydsl/commit/586c08e337afc1b46594f9971010a6e02a20782d))

CHANGELOG.zh-cn.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,20 @@
99

1010
### Chores
1111

12-
- **deps**: bumped spring version to 3.0.1 ([6c6f4521](https://github.com/ymind/rsql-querydsl/commit/6c6f4521f7833546c53dc9a29946101e779f0d84))
12+
- **deps**: bumped spring version to 3.0.1 ([a5d3da5f](https://github.com/ymind/rsql-querydsl/commit/a5d3da5f1571775184290553db4b47911d9de330))
13+
- no longer print stack trace when TypeNotSupportedException occurred ([1fd80544](https://github.com/ymind/rsql-querydsl/commit/1fd805446ba0522c679f84b633d0be9c617e4e80))
14+
15+
16+
### Styles
17+
18+
- code cleanup ([3e7152bc](https://github.com/ymind/rsql-querydsl/commit/3e7152bcaf1254bfd957ffa7ce61562320836f39))
1319

1420

1521
### Build System
1622

23+
- **github:actions**: fix github actions ([5864ee73](https://github.com/ymind/rsql-querydsl/commit/5864ee7376c1499ee346b791a59ccdee32c28537))
1724
- **gradle**: bumped gradle wrapper version to 7.5.1 ([fb6c22e7](https://github.com/ymind/rsql-querydsl/commit/fb6c22e7c1d8d5190580e9e7f38c7ea8cbd99463))
25+
- **gradle**: bumped gradle wrapper version to 7.6 ([775303b1](https://github.com/ymind/rsql-querydsl/commit/775303b1f79300eaf94668a08337164e2635fdd4))
1826
- **gradle:plugin**: remove ktlint plugin ([7cddf171](https://github.com/ymind/rsql-querydsl/commit/7cddf171994e046a53ba664c5d3ebbfb9f885054))
1927
- **gradle:plugin**: bumped io.gitlab.arturbosch.detekt version to 1.22.0 ([c07c4173](https://github.com/ymind/rsql-querydsl/commit/c07c4173ee567111d28840f65f505df8dfd9ebe8))
2028
- **gradle:plugin**: bumped com.github.ben-manes.versions version to 0.44.0 ([586c08e3](https://github.com/ymind/rsql-querydsl/commit/586c08e337afc1b46594f9971010a6e02a20782d))

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
![rsql-querydsl](https://github.com/ymind/rsql-querydsl/workflows/rsql-querydsl/badge.svg?branch=master)
1+
![rsql-querydsl](https://github.com/ymind/rsql-querydsl/workflows/rsql-querydsl/badge.svg?branch=main)
22
[![GitHub release (latest by date)](https://img.shields.io/github/v/release/ymind/rsql-querydsl)](https://github.com/ymind/rsql-querydsl/releases)
33
[![Maven Central](https://img.shields.io/maven-central/v/team.yi.rsql/rsql-querydsl)](https://search.maven.org/artifact/team.yi.rsql/rsql-querydsl)
44
[![Semantic Versioning 2.0.0](https://img.shields.io/badge/Semantic%20Versioning-2.0.0-brightgreen)](https://semver.org/)
55
[![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg)](https://conventionalcommits.org)
6-
[![GitHub](https://img.shields.io/github/license/ymind/rsql-querydsl)](https://github.com/ymind/rsql-querydsl/blob/master/LICENSE)
6+
[![GitHub](https://img.shields.io/github/license/ymind/rsql-querydsl)](https://github.com/ymind/rsql-querydsl/blob/main/LICENSE)
77

88
# rsql-querydsl
99

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ tasks {
9393
changelog {
9494
group = "publishing"
9595

96-
toRef = "master"
96+
toRef = "main"
9797
strategy = team.yi.tools.semanticgitlog.VersionStrategy.slow
9898

9999
minorTypes = "feat,refactor,perf,revert"
@@ -129,7 +129,7 @@ tasks {
129129
derive {
130130
group = "publishing"
131131

132-
toRef = "master"
132+
toRef = "main"
133133
strategy = team.yi.tools.semanticgitlog.VersionStrategy.slow
134134
derivedVersionMark = "NEXT_VERSION:=="
135135

docs/_coverpage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
[Getting Started](en-us/)
1515
[GitHub](https://github.com/ymind/rsql-querydsl)
1616

17-
[10]: https://github.com/ymind/rsql-querydsl/workflows/rsql-querydsl/badge.svg?branch=master
17+
[10]: https://github.com/ymind/rsql-querydsl/workflows/rsql-querydsl/badge.svg?branch=main
1818
[11]: https://github.com/ymind/rsql-querydsl/actions
1919
[20]: https://img.shields.io/github/v/release/ymind/rsql-querydsl
2020
[21]: https://github.com/ymind/rsql-querydsl/releases
@@ -25,4 +25,4 @@
2525
[50]: https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg
2626
[51]: https://conventionalcommits.org
2727
[60]: https://img.shields.io/github/license/ymind/rsql-querydsl
28-
[61]: https://github.com/ymind/rsql-querydsl/blob/master/LICENSE
28+
[61]: https://github.com/ymind/rsql-querydsl/blob/main/LICENSE

docs/en-us/changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[remoteMarkdownUrl](https://raw.githubusercontent.com/ymind/rsql-querydsl/master/CHANGELOG.md)
1+
[remoteMarkdownUrl](https://raw.githubusercontent.com/ymind/rsql-querydsl/main/CHANGELOG.md)

docs/zh-cn/changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[remoteMarkdownUrl](https://raw.githubusercontent.com/ymind/rsql-querydsl/master/CHANGELOG.zh-cn.md)
1+
[remoteMarkdownUrl](https://raw.githubusercontent.com/ymind/rsql-querydsl/main/CHANGELOG.zh-cn.md)

0 commit comments

Comments
 (0)