Compare commits
5 Commits
1.14.4-R0.
...
ver/1.13.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f60a0000b5 | ||
|
|
64e8f54516 | ||
|
|
b847dac342 | ||
|
|
404f72e0ec | ||
|
|
4974d6f581 |
@@ -1,48 +0,0 @@
|
|||||||
version: 2
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
working_directory: ~/Akarin-project/Akarin
|
|
||||||
parallelism: 1
|
|
||||||
shell: /bin/bash --login
|
|
||||||
environment:
|
|
||||||
CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
|
|
||||||
CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
|
|
||||||
docker:
|
|
||||||
- image: circleci/build-image:ubuntu-14.04-XXL-upstart-1189-5614f37
|
|
||||||
command: /sbin/init
|
|
||||||
steps:
|
|
||||||
# Machine Setup
|
|
||||||
- checkout
|
|
||||||
# Prepare for artifact
|
|
||||||
- run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
|
|
||||||
- run:
|
|
||||||
working_directory: ~/Akarin-project/Akarin
|
|
||||||
command: sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java; sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac; echo -e "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> $BASH_ENV
|
|
||||||
# Dependencies
|
|
||||||
# Restore the dependency cache
|
|
||||||
- restore_cache:
|
|
||||||
keys:
|
|
||||||
# This branch if available
|
|
||||||
- v1-dep-{{ .Branch }}-
|
|
||||||
# Any branch if there are none on the default branch - this should be unnecessary if you have your default branch configured correctly
|
|
||||||
- v1-dep-
|
|
||||||
- run: git config --global user.email "circle@circleci.com"
|
|
||||||
- run: git config --global user.name "CircleCI"
|
|
||||||
- run: chmod +x scripts/inst.sh
|
|
||||||
- run: ./scripts/inst.sh --setup --remote
|
|
||||||
# Save dependency cache
|
|
||||||
- save_cache:
|
|
||||||
key: v1-dep-{{ .Branch }}-{{ epoch }}
|
|
||||||
paths:
|
|
||||||
- ~/.m2
|
|
||||||
# Test
|
|
||||||
- run: yes|cp -rf ./akarin-*.jar $CIRCLE_ARTIFACTS
|
|
||||||
# Teardown
|
|
||||||
# Save test results
|
|
||||||
- store_test_results:
|
|
||||||
path: /tmp/circleci-test-results
|
|
||||||
# Save artifacts
|
|
||||||
- store_artifacts:
|
|
||||||
path: /tmp/circleci-artifacts
|
|
||||||
- store_artifacts:
|
|
||||||
path: /tmp/circleci-test-results
|
|
||||||
21
.travis.yml
21
.travis.yml
@@ -1,21 +0,0 @@
|
|||||||
language: java
|
|
||||||
jdk:
|
|
||||||
- oraclejdk8
|
|
||||||
install: true
|
|
||||||
script:
|
|
||||||
- chmod +x ./scripts/inst.sh
|
|
||||||
- ./scripts/inst.sh --setup --remote
|
|
||||||
after_success:
|
|
||||||
- rm -rf push
|
|
||||||
- mkdir push
|
|
||||||
- cp ./target/*.jar ./push/
|
|
||||||
deploy:
|
|
||||||
skip_cleanup: true
|
|
||||||
provider: releases
|
|
||||||
api_key:
|
|
||||||
secure: $Github_token
|
|
||||||
file:
|
|
||||||
- ./push/*
|
|
||||||
file_glob: true
|
|
||||||
on:
|
|
||||||
tags: true
|
|
||||||
24
Jenkinsfile
vendored
Normal file
24
Jenkinsfile
vendored
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
pipeline {
|
||||||
|
agent any
|
||||||
|
stages {
|
||||||
|
stage('Init Submodules') {
|
||||||
|
steps {
|
||||||
|
sh 'git submodule update --init --recursive'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Build') {
|
||||||
|
steps {
|
||||||
|
sh 'bash ./scripts/build.sh'
|
||||||
|
sh 'bash ./scripts/inst.sh --setup --fast'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Archive') {
|
||||||
|
steps {
|
||||||
|
archiveArtifacts(artifacts: '*.jar', fingerprint: true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,9 +2,8 @@
|
|||||||
[](https://akarin.io)
|
[](https://akarin.io)
|
||||||
[](https://discord.gg/fw2pJAj)
|
[](https://discord.gg/fw2pJAj)
|
||||||
[](https://bstats.org/plugin/bukkit/Torch)
|
[](https://bstats.org/plugin/bukkit/Torch)
|
||||||
[](https://ci.melon.cat/job/Akarin/)
|

|
||||||
[](https://www.patreon.com/akarinproject)
|
[](https://www.patreon.com/akarinproject)
|
||||||
[](https://circleci.com/gh/Akarin-project/Akarin)
|
|
||||||
|
|
||||||
Akarin is currently **under heavy development** and contributions are welcome!
|
Akarin is currently **under heavy development** and contributions are welcome!
|
||||||
|
|
||||||
@@ -26,8 +25,7 @@ Get Akarin
|
|||||||
---
|
---
|
||||||
### Download
|
### Download
|
||||||
#### Recommended
|
#### Recommended
|
||||||
+ [**Circle CI**](https://circleci.com/gh/Akarin-project/Akarin/tree/ver/master) - Checkout the 'Artifacts' tab of the latest build *Login required*
|
+ [**JosephWorks Jenkins**](http://ci.josephworks.net/job/Akarin)
|
||||||
+ [**Melon Jenkins**](https://ci.melon.cat/job/Akarin/)
|
|
||||||
|
|
||||||
*Open an [Issue](https://github.com/Akarin-project/Akarin/issues) or a [Pull Request](https://github.com/Akarin-project/Akarin/pulls) if you want to add your website here*
|
*Open an [Issue](https://github.com/Akarin-project/Akarin/issues) or a [Pull Request](https://github.com/Akarin-project/Akarin/pulls) if you want to add your website here*
|
||||||
|
|
||||||
|
|||||||
23
pom.xml
23
pom.xml
@@ -1,4 +1,4 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>akarin</artifactId>
|
<artifactId>akarin</artifactId>
|
||||||
@@ -210,8 +210,8 @@
|
|||||||
</repository>
|
</repository>
|
||||||
<!-- Akarin -->
|
<!-- Akarin -->
|
||||||
<repository>
|
<repository>
|
||||||
<id>nallar-repo</id>
|
<id>josephworks</id>
|
||||||
<url>https://repo.nallar.me/</url>
|
<url>http://repo.josephworks.net/repository/maven-public/</url>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
<repository>
|
||||||
<id>spongepowered-repo</id>
|
<id>spongepowered-repo</id>
|
||||||
@@ -221,10 +221,6 @@
|
|||||||
<id>sonatype-nexusg</id>
|
<id>sonatype-nexusg</id>
|
||||||
<url>https://oss.sonatype.org/content/repositories</url>
|
<url>https://oss.sonatype.org/content/repositories</url>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
|
||||||
<id>tu-darmstadt</id>
|
|
||||||
<url>https://zoidberg.ukp.informatik.tu-darmstadt.de/artifactory/public-releases/</url>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
<pluginRepositories>
|
<pluginRepositories>
|
||||||
@@ -307,7 +303,8 @@
|
|||||||
<goal>shade</goal>
|
<goal>shade</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> <!-- Paper -->
|
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml
|
||||||
|
</dependencyReducedPomLocation> <!-- Paper -->
|
||||||
<createSourcesJar>${shadeSourcesJar}</createSourcesJar>
|
<createSourcesJar>${shadeSourcesJar}</createSourcesJar>
|
||||||
<relocations>
|
<relocations>
|
||||||
<!-- Cannot be relocated as it breaks translation property keys -->
|
<!-- Cannot be relocated as it breaks translation property keys -->
|
||||||
@@ -323,8 +320,8 @@
|
|||||||
</relocation>
|
</relocation>
|
||||||
<!-- Paper - Don't relocate fastutil in order to prevent api breakage -->
|
<!-- Paper - Don't relocate fastutil in order to prevent api breakage -->
|
||||||
<!--<relocation>-->
|
<!--<relocation>-->
|
||||||
<!--<pattern>it.unimi</pattern>-->
|
<!--<pattern>it.unimi</pattern>-->
|
||||||
<!--<shadedPattern>org.bukkit.craftbukkit.libs.it.unimi</shadedPattern>-->
|
<!--<shadedPattern>org.bukkit.craftbukkit.libs.it.unimi</shadedPattern>-->
|
||||||
<!--</relocation>-->
|
<!--</relocation>-->
|
||||||
<relocation>
|
<relocation>
|
||||||
<pattern>org.bukkit.craftbukkit</pattern>
|
<pattern>org.bukkit.craftbukkit</pattern>
|
||||||
@@ -339,10 +336,12 @@
|
|||||||
</relocation>
|
</relocation>
|
||||||
</relocations>
|
</relocations>
|
||||||
<transformers>
|
<transformers>
|
||||||
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
|
<transformer
|
||||||
|
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
|
||||||
<resource>META-INF/services/java.sql.Driver</resource>
|
<resource>META-INF/services/java.sql.Driver</resource>
|
||||||
</transformer>
|
</transformer>
|
||||||
<transformer implementation="com.github.edwgiz.mavenShadePlugin.log4j2CacheTransformer.PluginsCacheFileTransformer" />
|
<transformer
|
||||||
|
implementation="com.github.edwgiz.mavenShadePlugin.log4j2CacheTransformer.PluginsCacheFileTransformer"/>
|
||||||
</transformers>
|
</transformers>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
|||||||
Reference in New Issue
Block a user