Skip to content

Commit f9458c3

Browse files
Lori3f6Lori3f6
committed
(ci) bring nyaacat ci back
1 parent a64abd4 commit f9458c3

File tree

3 files changed

+59
-84
lines changed

3 files changed

+59
-84
lines changed

‎.github/workflows/autobuild.yml

+22-22
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,27 @@ jobs:
2424
distribution: 'oracle'
2525
java-version: '21'
2626

27-
- name: setup maven
28-
uses: s4u/[email protected]
29-
with:
30-
servers: |
31-
[
32-
{
33-
"id": "ghpkg-SimpleLanguageLoader",
34-
"username": "${{github.actor}}",
35-
"password": "${{secrets.GITHUB_TOKEN}}"
36-
},
37-
{
38-
"id": "ghpkg-ECore",
39-
"username": "${{github.actor}}",
40-
"password": "${{secrets.GITHUB_TOKEN}}"
41-
},
42-
{
43-
"id": "ghpkg-LockettePro",
44-
"username": "${{github.actor}}",
45-
"password": "${{secrets.GITHUB_TOKEN}}"
46-
}
47-
]
27+
# - name: setup maven
28+
# uses: s4u/[email protected]
29+
# with:
30+
# servers: |
31+
# [
32+
# {
33+
# "id": "ghpkg-SimpleLanguageLoader",
34+
# "username": "${{github.actor}}",
35+
# "password": "${{secrets.GITHUB_TOKEN}}"
36+
# },
37+
# {
38+
# "id": "ghpkg-ECore",
39+
# "username": "${{github.actor}}",
40+
# "password": "${{secrets.GITHUB_TOKEN}}"
41+
# },
42+
# {
43+
# "id": "ghpkg-LockettePro",
44+
# "username": "${{github.actor}}",
45+
# "password": "${{secrets.GITHUB_TOKEN}}"
46+
# }
47+
# ]
4848

4949
- name: checkout repo
5050
uses: actions/checkout@v4
@@ -55,5 +55,5 @@ jobs:
5555
- name: upload artifacts
5656
uses: actions/upload-artifact@v4
5757
with:
58-
name: ${{github.event.repository.name}}-autobuild-${{github.run_number}}-git-${{github.sha}}.zip
58+
name: ${{github.event.repository.name}}-autobuild-${{github.run_number}}-git-${{github.sha}}
5959
path: ./target/*.jar

‎.github/workflows/maven-publish-ghpkg.yml

+26-28
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ name: Publish to GitHub Packages
1313
run-name: 'Package Publish #${{github.run_number}}'
1414

1515
on:
16-
release:
17-
types: [published]
1816
workflow_dispatch:
1917

2018
jobs:
@@ -35,32 +33,32 @@ jobs:
3533
java-version: '21'
3634
distribution: 'oracle'
3735

38-
- name: setup maven
39-
uses: s4u/[email protected]
40-
with:
41-
servers: |
42-
[
43-
{
44-
"id": "ghpkg-SimpleLanguageLoader",
45-
"username": "${{github.actor}}",
46-
"password": "${{secrets.GITHUB_TOKEN}}"
47-
},
48-
{
49-
"id": "ghpkg-ECore",
50-
"username": "${{github.actor}}",
51-
"password": "${{secrets.GITHUB_TOKEN}}"
52-
},
53-
{
54-
"id": "ghpkg-LockettePro",
55-
"username": "${{github.actor}}",
56-
"password": "${{secrets.GITHUB_TOKEN}}"
57-
},
58-
{
59-
"id": "maven-publish",
60-
"username": "${{github.actor}}",
61-
"password": "${{secrets.GITHUB_TOKEN}}"
62-
}
63-
]
36+
# - name: setup maven
37+
# uses: s4u/[email protected]
38+
# with:
39+
# servers: |
40+
# [
41+
# {
42+
# "id": "ghpkg-SimpleLanguageLoader",
43+
# "username": "${{github.actor}}",
44+
# "password": "${{secrets.GITHUB_TOKEN}}"
45+
# },
46+
# {
47+
# "id": "ghpkg-ECore",
48+
# "username": "${{github.actor}}",
49+
# "password": "${{secrets.GITHUB_TOKEN}}"
50+
# },
51+
# {
52+
# "id": "ghpkg-LockettePro",
53+
# "username": "${{github.actor}}",
54+
# "password": "${{secrets.GITHUB_TOKEN}}"
55+
# },
56+
# {
57+
# "id": "maven-publish",
58+
# "username": "${{github.actor}}",
59+
# "password": "${{secrets.GITHUB_TOKEN}}"
60+
# }
61+
# ]
6462

6563
- name: Publish to GitHub Packages Apache Maven
6664
run: mvn --batch-mode deploy -Pdeploy-github

‎pom.xml

+11-34
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66

77
<groupId>cat.nyaa</groupId>
88
<artifactId>ukit</artifactId>
9-
<version>1.6-SNAPSHOT</version>
9+
<version>1.6</version>
1010

1111
<properties>
1212
<maven.compiler.source>21</maven.compiler.source>
1313
<maven.compiler.target>21</maven.compiler.target>
14-
<minecraft.version>1.21.1</minecraft.version>
1514
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1615
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
16+
<github.package.url>${env.GITHUB_MAVEN_URL}</github.package.url>
1717
</properties>
1818

1919
<repositories>
20-
<!-- <repository>
20+
<repository>
2121
<id>nyaacat-repo</id>
22-
<url>https://ci.nyaacat.com/maven</url>
23-
</repository> -->
22+
<url>https://ci.nyaacat.com/maven/</url>
23+
</repository>
2424
<repository>
2525
<id>jitpack.io</id>
2626
<url>https://jitpack.io</url>
@@ -29,25 +29,9 @@
2929
<id>papermc</id>
3030
<url>https://repo.papermc.io/repository/maven-public/</url>
3131
</repository>
32-
<!-- <repository>
32+
<repository>
3333
<id>essentials-releases</id>
3434
<url>https://repo.essentialsx.net/releases/</url>
35-
</repository> -->
36-
<repository>
37-
<id>essentials-snapshots</id>
38-
<url>https://repo.essentialsx.net/snapshots/</url>
39-
</repository>
40-
<repository>
41-
<id>ghpkg-SimpleLanguageLoader</id>
42-
<url>https://maven.pkg.github.com/Lori3f6/SimpleLanguageLoader</url>
43-
</repository>
44-
<repository>
45-
<id>ghpkg-ECore</id>
46-
<url>https://maven.pkg.github.com/NyaaCat/ECore</url>
47-
</repository>
48-
<repository>
49-
<id>ghpkg-LockettePro</id>
50-
<url>https://maven.pkg.github.com/NyaaCat/LockettePro</url>
5135
</repository>
5236
</repositories>
5337

@@ -60,8 +44,8 @@
6044
</dependency>
6145
<dependency>
6246
<groupId>land.melon.lab</groupId>
63-
<artifactId>SimpleLanguageLoader</artifactId>
64-
<version>1.13.4</version>
47+
<artifactId>simplelanguageloader</artifactId>
48+
<version>1.13.5</version>
6549
<scope>compile</scope>
6650
</dependency>
6751
<dependency>
@@ -91,24 +75,17 @@
9175
<dependency>
9276
<groupId>net.essentialsx</groupId>
9377
<artifactId>EssentialsX</artifactId>
94-
<version>2.21.0-SNAPSHOT</version>
78+
<version>2.20.1</version>
9579
<scope>provided</scope>
9680
</dependency>
9781
<dependency>
9882
<groupId>net.essentialsx</groupId>
9983
<artifactId>EssentialsXDiscord</artifactId>
100-
<version>2.21.0-SNAPSHOT</version>
84+
<version>2.20.1</version>
10185
<scope>provided</scope>
10286
</dependency>
10387
</dependencies>
10488

105-
<pluginRepositories>
106-
<pluginRepository>
107-
<id>maven-snapshots</id>
108-
<url>https://repository.apache.org/content/repositories/snapshots/</url>
109-
</pluginRepository>
110-
</pluginRepositories>
111-
11289
<build>
11390
<resources>
11491
<resource>
@@ -186,7 +163,7 @@
186163
<distributionManagement>
187164
<repository>
188165
<id>maven-publish</id>
189-
<url>${env.MAVEN_PUBLISH_URL}</url>
166+
<url>${github.package.url}</url>
190167
<!-- refer to .github/workflows/maven-publish-ghpkg.yml -->
191168
</repository>
192169
</distributionManagement>

0 commit comments

Comments
 (0)