Skip to content

Commit 0229830

Browse files
authored
Merge branch 'main' into main
2 parents e381456 + 20f3059 commit 0229830

File tree

4 files changed

+37
-6
lines changed

4 files changed

+37
-6
lines changed

.github/workflows/release.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Release
22

33
on:
4-
workflow_call:
4+
workflow_dispatch:
55

66
permissions:
77
contents: read
@@ -22,14 +22,24 @@ jobs:
2222
maven-version: 3.9.9
2323
cache-enabled: true
2424

25+
- name: Configure Git
26+
run: |
27+
git config user.name "github-actions[bot]"
28+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
29+
30+
- name: Setup SSH
31+
uses: webfactory/[email protected]
32+
with:
33+
ssh-private-key: ${{ secrets.RELEASE_SSH_KEY }}
34+
2535
- name: Maven release
26-
run: mvn --batch-mode --update-snapshots -DtagNameFormat=@{project.version} -Dmaven.resolver.transport=wagon -DskipTests release:prepare release:perform
36+
run: mvn --batch-mode --update-snapshots -Dmaven.resolver.transport=wagon -DskipTests -Darguments="-DskipTests" release:prepare release:perform
2737
env:
2838
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2939

3040
- name: Close draft release
3141
run: |
32-
release=$(gh api /repos/$GITHUB_REPOSITORY/releases | jq -e -r '[ .[] | select(.draft == true).id] | max')
33-
gh api -X PATCH -F draft=false -F name=$version -F tag_name=$version /repos/$GITHUB_REPOSITORY/releases/$release
42+
release_id=$(gh api /repos/oras-project/oras-java/releases | jq -r '.[] | select(.draft == true) | .id')
43+
gh api -X PATCH -F draft=false /repos/oras-project/oras-java/releases/$release_id
3444
env:
3545
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.mvn/maven.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
-Drevision=0.1.0-SNAPSHOT

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ The maven resolver must be switched to `wagon` to deploy to GitHub Packages.
6767
mvn -Dmaven.resolver.transport=wagon -DskipTests -Poras-java clean deploy
6868
```
6969

70+
### Perform release
71+
72+
- Ensure the draft release version correspond to the version on the `pom.xml`
73+
- Run the release workflow
74+
7075
## Code of Conduct
7176

7277
Please note that this project has adopted the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md).

pom.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,18 @@
44

55
<groupId>land.oras.java</groupId>
66
<artifactId>oras-java-sdk</artifactId>
7-
<version>${revision}</version>
7+
<version>0.1.1-SNAPSHOT</version>
88
<packaging>jar</packaging>
99
<name>ORAS Java SDK</name>
1010
<url>https://github.com/oras-project/oras-java</url>
1111

12+
<scm>
13+
<connection>scm:git:[email protected]:oras-project/oras-java.git</connection>
14+
<developerConnection>scm:git:[email protected]:oras-project/oras-java.git</developerConnection>
15+
<tag>HEAD</tag>
16+
<url>https://github.com/oras-project/oras-java</url>
17+
</scm>
18+
1219
<!-- https://github.com/oras-project/oras-java/issues/19 for maven central distribution -->
1320
<distributionManagement>
1421
<repository>
@@ -45,6 +52,7 @@
4552
<spotless-maven-plugin.version>2.44.2</spotless-maven-plugin.version>
4653
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
4754
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
55+
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
4856

4957
<!-- Target Java 17 -->
5058
<maven.compiler.source>17</maven.compiler.source>
@@ -208,6 +216,15 @@
208216
</execution>
209217
</executions>
210218
</plugin>
219+
<plugin>
220+
<groupId>org.apache.maven.plugins</groupId>
221+
<artifactId>maven-release-plugin</artifactId>
222+
<version>${maven-release-plugin.version}</version>
223+
<configuration>
224+
<tagNameFormat>@{project.version}</tagNameFormat>
225+
<scmCommentPrefix>[ci skip]</scmCommentPrefix>
226+
</configuration>
227+
</plugin>
211228
<plugin>
212229
<groupId>org.apache.maven.plugins</groupId>
213230
<artifactId>maven-enforcer-plugin</artifactId>

0 commit comments

Comments
 (0)