From 81bf422250d2d62fc413444f093af2c83ad725ca Mon Sep 17 00:00:00 2001 From: 33 Date: Wed, 4 Jan 2023 15:12:17 +0800 Subject: [PATCH] Add: environment in GitHub Action --- .github/workflows/beta.yml | 3 ++- .github/workflows/canary.yml | 3 ++- .github/workflows/release.yml | 3 ++- .../java/customskinloader/gradle/BuildPlugin.java | 4 ++-- .../task/{UploadTask.java => UploadBaseTask.java} | 10 +++------- .../gradle/task/UploadBetaTask.java | 2 +- .../gradle/task/UploadCanaryTask.java | 2 +- .../gradle/task/UploadReleaseTask.java | 13 +++++++++++++ 8 files changed, 26 insertions(+), 14 deletions(-) rename buildSrc/src/main/java/customskinloader/gradle/task/{UploadTask.java => UploadBaseTask.java} (93%) create mode 100644 buildSrc/src/main/java/customskinloader/gradle/task/UploadReleaseTask.java diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index c89b529..1e9c27b 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -7,6 +7,7 @@ on: jobs: build: runs-on: ubuntu-latest + environment: Build steps: - name: Checkout @@ -31,5 +32,5 @@ jobs: - uses: actions/upload-artifact@v3 with: - name: CustomSkinLoader-Beta-${{ env.GITHUB_RUN_NUMBER }} + name: CustomSkinLoader-Beta-${{ github.run_number }} path: build/libs \ No newline at end of file diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 39fac95..17ddd73 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -7,6 +7,7 @@ on: jobs: build: runs-on: ubuntu-latest + environment: Build steps: - name: Checkout @@ -31,5 +32,5 @@ jobs: - uses: actions/upload-artifact@v3 with: - name: CustomSkinLoader-Canary-${{ env.GITHUB_RUN_NUMBER }} + name: CustomSkinLoader-Canary-${{ github.run_number }} path: build/libs \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab6ec12..9988e50 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,6 +7,7 @@ on: jobs: build: runs-on: ubuntu-latest + environment: Build steps: - name: Checkout @@ -32,5 +33,5 @@ jobs: - uses: actions/upload-artifact@v3 with: - name: CustomSkinLoader-Beta-${{ env.GITHUB_RUN_NUMBER }} + name: CustomSkinLoader-Beta-${{ github.run_number }} path: build/libs \ No newline at end of file diff --git a/buildSrc/src/main/java/customskinloader/gradle/BuildPlugin.java b/buildSrc/src/main/java/customskinloader/gradle/BuildPlugin.java index 24d3997..4a775e2 100644 --- a/buildSrc/src/main/java/customskinloader/gradle/BuildPlugin.java +++ b/buildSrc/src/main/java/customskinloader/gradle/BuildPlugin.java @@ -2,7 +2,7 @@ package customskinloader.gradle; import customskinloader.gradle.task.UploadBetaTask; import customskinloader.gradle.task.UploadCanaryTask; -import customskinloader.gradle.task.UploadTask; +import customskinloader.gradle.task.UploadReleaseTask; import org.gradle.api.Plugin; import org.gradle.api.Project; @@ -10,7 +10,7 @@ public class BuildPlugin implements Plugin { @Override public void apply(Project project) { System.out.printf("Apply project '%s'", project.getName()); - project.getTasks().create("upload", UploadTask.class, + project.getTasks().create("upload", UploadReleaseTask.class, task -> task.rootProject = project.getRootProject()); project.getTasks().create("uploadBeta", UploadBetaTask.class, task -> task.rootProject = project.getRootProject()); diff --git a/buildSrc/src/main/java/customskinloader/gradle/task/UploadTask.java b/buildSrc/src/main/java/customskinloader/gradle/task/UploadBaseTask.java similarity index 93% rename from buildSrc/src/main/java/customskinloader/gradle/task/UploadTask.java rename to buildSrc/src/main/java/customskinloader/gradle/task/UploadBaseTask.java index 42e8ef3..1926635 100644 --- a/buildSrc/src/main/java/customskinloader/gradle/task/UploadTask.java +++ b/buildSrc/src/main/java/customskinloader/gradle/task/UploadBaseTask.java @@ -12,9 +12,8 @@ import customskinloader.gradle.util.CosUtil; import customskinloader.gradle.util.VersionUtil; import org.gradle.api.DefaultTask; import org.gradle.api.Project; -import org.gradle.api.tasks.TaskAction; -public class UploadTask extends DefaultTask { +public abstract class UploadBaseTask extends DefaultTask { public Project rootProject; private CslLatest uploadArtifacts(String filename) throws IOException { @@ -74,7 +73,9 @@ public class UploadTask extends DefaultTask { } protected void uploadBase(String latestJsonName, String detailJsonName) throws IOException, TencentCloudSDKException { + System.out.printf("latestJsonName: %s, detailJsonName: %s\n", latestJsonName, detailJsonName); if (System.getenv("COS_SECRET_KEY") == null) { + System.out.println("COS_SECRET_KEY not found."); return; } CslLatest latest = uploadArtifacts(latestJsonName); @@ -84,9 +85,4 @@ public class UploadTask extends DefaultTask { uploadDetail(latest, detailJsonName); CdnUtil.updateCdn(latestJsonName, detailJsonName); } - - @TaskAction - public void upload() throws IOException, TencentCloudSDKException { - uploadBase("latest.json","detail.json"); - } } diff --git a/buildSrc/src/main/java/customskinloader/gradle/task/UploadBetaTask.java b/buildSrc/src/main/java/customskinloader/gradle/task/UploadBetaTask.java index 80aa07f..c49efc6 100644 --- a/buildSrc/src/main/java/customskinloader/gradle/task/UploadBetaTask.java +++ b/buildSrc/src/main/java/customskinloader/gradle/task/UploadBetaTask.java @@ -5,7 +5,7 @@ import org.gradle.api.tasks.TaskAction; import java.io.IOException; -public class UploadBetaTask extends UploadTask { +public class UploadBetaTask extends UploadBaseTask { @TaskAction public void uploadBeta() throws IOException, TencentCloudSDKException { uploadBase("latest-beta.json", "detail-beta.json"); diff --git a/buildSrc/src/main/java/customskinloader/gradle/task/UploadCanaryTask.java b/buildSrc/src/main/java/customskinloader/gradle/task/UploadCanaryTask.java index 36a1066..80bb9b8 100644 --- a/buildSrc/src/main/java/customskinloader/gradle/task/UploadCanaryTask.java +++ b/buildSrc/src/main/java/customskinloader/gradle/task/UploadCanaryTask.java @@ -5,7 +5,7 @@ import org.gradle.api.tasks.TaskAction; import java.io.IOException; -public class UploadCanaryTask extends UploadTask { +public class UploadCanaryTask extends UploadBaseTask { @TaskAction public void uploadCanary() throws IOException, TencentCloudSDKException { uploadBase("latest-canary.json","detail-canary.json"); diff --git a/buildSrc/src/main/java/customskinloader/gradle/task/UploadReleaseTask.java b/buildSrc/src/main/java/customskinloader/gradle/task/UploadReleaseTask.java new file mode 100644 index 0000000..4686aa5 --- /dev/null +++ b/buildSrc/src/main/java/customskinloader/gradle/task/UploadReleaseTask.java @@ -0,0 +1,13 @@ +package customskinloader.gradle.task; + +import com.tencentcloudapi.common.exception.TencentCloudSDKException; +import org.gradle.api.tasks.TaskAction; + +import java.io.IOException; + +public class UploadReleaseTask extends UploadBaseTask{ + @TaskAction + public void upload() throws IOException, TencentCloudSDKException { + uploadBase("latest.json","detail.json"); + } +}