From 50e9f2916a1649bba826d7dbe398d642dfb05dde Mon Sep 17 00:00:00 2001 From: xiangzihao <460888207@qq.com> Date: Thu, 2 Jun 2022 17:26:52 +0800 Subject: [PATCH] [CI] bumping actions/cache to v3 to fix ci error (#10345) * bumping actions/cache to v3 * fix JSONUtilsTest.java unit test error --- .github/workflows/backend.yml | 2 +- .github/workflows/e2e.yml | 4 ++-- .github/workflows/publish-docker.yaml | 2 +- .github/workflows/py-ci.yml | 2 +- .github/workflows/unit-test.yml | 2 +- .../apache/dolphinscheduler/common/utils/JSONUtilsTest.java | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml index 85670724a7..d86837f6df 100644 --- a/.github/workflows/backend.yml +++ b/.github/workflows/backend.yml @@ -63,7 +63,7 @@ jobs: submodules: true - name: Sanity Check uses: ./.github/actions/sanity-check - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.m2/repository key: ${{ runner.os }}-maven diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index c8f7ef7cf6..db15d51594 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -55,7 +55,7 @@ jobs: - name: Sanity Check uses: ./.github/actions/sanity-check - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} @@ -127,7 +127,7 @@ jobs: with: submodules: true - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index 0b7d6ff20c..5774e166ad 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -35,7 +35,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/py-ci.yml b/.github/workflows/py-ci.yml index bec1d74f3f..2ec772b0b2 100644 --- a/.github/workflows/py-ci.yml +++ b/.github/workflows/py-ci.yml @@ -127,7 +127,7 @@ jobs: - name: Sanity Check uses: ./.github/actions/sanity-check - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index b32fc5f6c6..02b03d5af8 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -65,7 +65,7 @@ jobs: with: java-version: 8 distribution: 'adopt' - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.m2/repository key: ${{ runner.os }}-maven diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java index 2d638c943e..3a684785e1 100644 --- a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java @@ -262,7 +262,7 @@ public class JSONUtilsTest { @Test public void dateToString() { - TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai")); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); String time = "2022-02-22 13:38:24"; Date date = DateUtils.stringToDate(time); String json = JSONUtils.toJsonString(date); @@ -274,7 +274,7 @@ public class JSONUtilsTest { @Test public void stringToDate() { - TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai")); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); String json = "\"2022-02-22 13:38:24\""; Date date = JSONUtils.parseObject(json, Date.class); Assert.assertEquals(date, DateUtils.stringToDate("2022-02-22 13:38:24"));