From 3945599fb449bd399c97fb55f9a08bd87559fee7 Mon Sep 17 00:00:00 2001 From: Alexander Xia Date: Tue, 6 Feb 2018 06:03:54 +0800 Subject: [PATCH] Try CircleCI --- .gitignore | 3 ++- .../customskinloader/profile/ProfileCache.java | 1 - Forge/build.gradle | 6 +++--- circle.yml | 17 +++++++++++++++++ common.gradle | 8 +++++--- 5 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 circle.yml diff --git a/.gitignore b/.gitignore index f156e89..8684fd9 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,5 @@ hs_err_pid* .settings/ #gradle -.gradle/ \ No newline at end of file +.gradle/ +build/ \ No newline at end of file diff --git a/Common/source/customskinloader/profile/ProfileCache.java b/Common/source/customskinloader/profile/ProfileCache.java index 918ec76..51805ba 100644 --- a/Common/source/customskinloader/profile/ProfileCache.java +++ b/Common/source/customskinloader/profile/ProfileCache.java @@ -87,7 +87,6 @@ public class ProfileCache { } private void saveLocalProfile(String username,UserProfile profile){ String json=CustomSkinLoader.GSON.toJson(profile); - File localProfile=new File(PROFILE_CACHE_DIR,username.toLowerCase()+".json"); if(localProfile.exists()) localProfile.delete(); try { diff --git a/Forge/build.gradle b/Forge/build.gradle index 4c72c2d..6958225 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -21,7 +21,7 @@ ext.MINECRAFT_FULL_VERSIONS="1.8,1.8.8,1.8.9,1.9,1.9.4,1.10,1.10.2,1.11,1.11.2,1 ext.snapshot = !(rootProject.ext.config.snapshot==""||rootProject.ext.config.snapshot=="0"||rootProject.ext.config.snapshot==0) archivesBaseName = "CustomSkinLoader_Forge" -version = rootProject.ext.config.version + rootProject.ext.config.dev_version + (snapshot?"-SNAPSHOT-"+System.getenv("BUILD_NUMBER"):"") +version = rootProject.ext.config.version + rootProject.ext.config.dev_version + (snapshot?"-SNAPSHOT-"+System.getenv("CIRCLE_BUILD_NUM"):"") group = "customskinloader" sourceCompatibility = targetCompatibility = "1.6" @@ -85,8 +85,8 @@ processResources mcVersion :MINECRAFT_VERSION, mcFullVersions :MINECRAFT_FULL_VERSIONS, forgeVersion :FORGE_VERSION, - gitVersion :System.getenv("GIT_COMMIT"), - buildUrl :System.getenv("BUILD_URL") + gitVersion :System.getenv("CIRCLE_SHA1"), + buildUrl :System.getenv("CIRCLE_BUILD_URL") ]) } diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..2ee139f --- /dev/null +++ b/circle.yml @@ -0,0 +1,17 @@ +machine: + java: + version: oraclejdk8 +dependencies: + pre: + - gradle --version + - sudo add-apt-repository ppa:cwchien/gradle -y + - sudo apt-get update + - sudo apt-get install gradle + - gradle --version + override: + - gradle dependencies --stacktrace + cache_directories: + - ~/.gradle +general: + artifacts: + - "build/libs" \ No newline at end of file diff --git a/common.gradle b/common.gradle index d6795e6..c6f6117 100644 --- a/common.gradle +++ b/common.gradle @@ -30,7 +30,7 @@ configFile.withReader { project.ext.config = new ConfigSlurper().parse prop } //Example: 14.4a-SNAPSHOT-20160820 -version = rootProject.ext.config.version + rootProject.ext.config.dev_version + ((rootProject.ext.config.snapshot==""||rootProject.ext.config.snapshot=="0"||rootProject.ext.config.snapshot==0)?'':('-SNAPSHOT-'+System.getenv("BUILD_NUMBER"))) +version = rootProject.ext.config.version + rootProject.ext.config.dev_version + ((rootProject.ext.config.snapshot==""||rootProject.ext.config.snapshot=="0"||rootProject.ext.config.snapshot==0)?'':('-SNAPSHOT-'+System.getenv("CIRCLE_BUILD_NUM"))) group = config.group archivesBaseName = rootProject.ext.config.name+"_"+config.minecraft_version @@ -72,8 +72,10 @@ processResources { mcVersion:config.minecraft_version, mcFullVersions:config.minecraft_full_versions, forgeVersion:config.forge_version, - gitVersion:System.getenv("GIT_COMMIT"), - buildUrl:System.getenv("BUILD_URL") + //gitVersion:System.getenv("GIT_COMMIT"), + //buildUrl:System.getenv("BUILD_URL") + gitVersion:System.getenv("CIRCLE_SHA1"), + buildUrl:System.getenv("CIRCLE_BUILD_URL") ]) } task copyResources << {