This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a commit to branch ci/composite-uses in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 95f66c386e259d0bbdfdc0fa5beb24ba8455af98 Author: kezhenxu94 <[email protected]> AuthorDate: Thu Aug 19 09:58:06 2021 +0800 Simplify GitHub workflows by using `uses` in `composite` actions `uses` is recently allowed in `composite` actions, we can simplify our workflows control files further. --- .github/actions/e2e-test/action.yml | 7 +++++++ .github/actions/plugins-test/action.yml | 7 +++++++ .github/workflows/e2e.alarm.yaml | 8 -------- .github/workflows/e2e.cluster.yaml | 8 -------- .github/workflows/e2e.compat.yaml | 8 -------- .github/workflows/e2e.event.yaml | 8 -------- .github/workflows/e2e.go.yaml | 8 -------- .github/workflows/e2e.jdk-versions.yaml | 11 +++-------- .github/workflows/e2e.js.yaml | 16 ---------------- .github/workflows/e2e.kafka.yaml | 8 -------- .github/workflows/e2e.log.yaml | 16 ---------------- .github/workflows/e2e.nodejs.yaml | 8 -------- .github/workflows/e2e.php.yaml | 8 -------- .github/workflows/e2e.profiling.yaml | 8 -------- .github/workflows/e2e.python.yaml | 8 -------- .github/workflows/e2e.so11y.yaml | 8 -------- .github/workflows/e2e.storages.yaml | 9 --------- .github/workflows/e2e.ttl.yaml | 8 -------- .github/workflows/e2e.yaml | 16 ---------------- .github/workflows/plugins-jdk14-test.0.yaml | 7 ------- .github/workflows/plugins-test.0.yaml | 7 ------- .github/workflows/plugins-test.1.yaml | 7 ------- .github/workflows/plugins-test.2.yaml | 7 ------- .github/workflows/plugins-test.3.yaml | 7 ------- 24 files changed, 17 insertions(+), 196 deletions(-) diff --git a/.github/actions/e2e-test/action.yml b/.github/actions/e2e-test/action.yml index 6cd1ce3..a03bc0f 100644 --- a/.github/actions/e2e-test/action.yml +++ b/.github/actions/e2e-test/action.yml @@ -25,6 +25,13 @@ inputs: runs: using: "composite" steps: + - name: Cache local Maven repository + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Check Unintended Changes shell: bash run: | diff --git a/.github/actions/plugins-test/action.yml b/.github/actions/plugins-test/action.yml index 3832cd9..9fb1d72 100644 --- a/.github/actions/plugins-test/action.yml +++ b/.github/actions/plugins-test/action.yml @@ -29,6 +29,13 @@ inputs: runs: using: "composite" steps: + - name: Cache local Maven repository + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven-agent- - name: Check Unintended Changes shell: bash run: | diff --git a/.github/workflows/e2e.alarm.yaml b/.github/workflows/e2e.alarm.yaml index 94d4a6b..4404e8c 100644 --- a/.github/workflows/e2e.alarm.yaml +++ b/.github/workflows/e2e.alarm.yaml @@ -47,14 +47,6 @@ jobs: submodules: true - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Run E2E Test if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test diff --git a/.github/workflows/e2e.cluster.yaml b/.github/workflows/e2e.cluster.yaml index 2241285..fb46869 100644 --- a/.github/workflows/e2e.cluster.yaml +++ b/.github/workflows/e2e.cluster.yaml @@ -47,14 +47,6 @@ jobs: submodules: true - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Run E2E Test if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test diff --git a/.github/workflows/e2e.compat.yaml b/.github/workflows/e2e.compat.yaml index e67bdbf..28e03fe 100644 --- a/.github/workflows/e2e.compat.yaml +++ b/.github/workflows/e2e.compat.yaml @@ -41,14 +41,6 @@ jobs: submodules: true - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Set Up Java if: env.SKIP_CI != 'true' uses: actions/setup-java@v1 diff --git a/.github/workflows/e2e.event.yaml b/.github/workflows/e2e.event.yaml index 3331c5c..13abeb8 100644 --- a/.github/workflows/e2e.event.yaml +++ b/.github/workflows/e2e.event.yaml @@ -47,14 +47,6 @@ jobs: submodules: true - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Run E2E Test if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test diff --git a/.github/workflows/e2e.go.yaml b/.github/workflows/e2e.go.yaml index b51feec..c594d03 100644 --- a/.github/workflows/e2e.go.yaml +++ b/.github/workflows/e2e.go.yaml @@ -43,14 +43,6 @@ jobs: submodules: true - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Run E2E Test if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test diff --git a/.github/workflows/e2e.jdk-versions.yaml b/.github/workflows/e2e.jdk-versions.yaml index b4236d6..42dd2cd 100644 --- a/.github/workflows/e2e.jdk-versions.yaml +++ b/.github/workflows/e2e.jdk-versions.yaml @@ -17,6 +17,9 @@ name: E2E on: + push: + branches: + - ci/composite-uses pull_request: schedule: - cron: '0 18 * * *' @@ -45,14 +48,6 @@ jobs: depth: 0 - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Set Up Java if: env.SKIP_CI != 'true' uses: actions/setup-java@v1 diff --git a/.github/workflows/e2e.js.yaml b/.github/workflows/e2e.js.yaml index 33a46e8..e364900 100644 --- a/.github/workflows/e2e.js.yaml +++ b/.github/workflows/e2e.js.yaml @@ -47,14 +47,6 @@ jobs: submodules: true - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Run E2E Test if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test @@ -70,14 +62,6 @@ jobs: submodules: true - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Run E2E Test if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test diff --git a/.github/workflows/e2e.kafka.yaml b/.github/workflows/e2e.kafka.yaml index eefba2b..fdbbd81 100644 --- a/.github/workflows/e2e.kafka.yaml +++ b/.github/workflows/e2e.kafka.yaml @@ -55,14 +55,6 @@ jobs: submodules: true - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Run E2E Test if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test diff --git a/.github/workflows/e2e.log.yaml b/.github/workflows/e2e.log.yaml index 3eea86d..46f4c95 100644 --- a/.github/workflows/e2e.log.yaml +++ b/.github/workflows/e2e.log.yaml @@ -48,14 +48,6 @@ jobs: submodules: true - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Run E2E Test if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test @@ -72,14 +64,6 @@ jobs: submodules: true - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Run E2E Test if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test diff --git a/.github/workflows/e2e.nodejs.yaml b/.github/workflows/e2e.nodejs.yaml index 2d97cea..4084cc7 100644 --- a/.github/workflows/e2e.nodejs.yaml +++ b/.github/workflows/e2e.nodejs.yaml @@ -43,14 +43,6 @@ jobs: submodules: true - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Run E2E Test if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test diff --git a/.github/workflows/e2e.php.yaml b/.github/workflows/e2e.php.yaml index d2ed5b6..bf24610 100644 --- a/.github/workflows/e2e.php.yaml +++ b/.github/workflows/e2e.php.yaml @@ -40,14 +40,6 @@ jobs: submodules: true - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Run E2E Test if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test diff --git a/.github/workflows/e2e.profiling.yaml b/.github/workflows/e2e.profiling.yaml index a1a2b54..bc7daf6 100644 --- a/.github/workflows/e2e.profiling.yaml +++ b/.github/workflows/e2e.profiling.yaml @@ -48,14 +48,6 @@ jobs: submodules: true - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Run E2E Test if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test diff --git a/.github/workflows/e2e.python.yaml b/.github/workflows/e2e.python.yaml index 49e8b4c..152bc46 100644 --- a/.github/workflows/e2e.python.yaml +++ b/.github/workflows/e2e.python.yaml @@ -43,14 +43,6 @@ jobs: submodules: true - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Run E2E Test if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test diff --git a/.github/workflows/e2e.so11y.yaml b/.github/workflows/e2e.so11y.yaml index 3066b86..cb3b945 100644 --- a/.github/workflows/e2e.so11y.yaml +++ b/.github/workflows/e2e.so11y.yaml @@ -43,14 +43,6 @@ jobs: submodules: true - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Run E2E Test if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test diff --git a/.github/workflows/e2e.storages.yaml b/.github/workflows/e2e.storages.yaml index 1f1e892..ea4ba9c 100644 --- a/.github/workflows/e2e.storages.yaml +++ b/.github/workflows/e2e.storages.yaml @@ -45,15 +45,6 @@ jobs: submodules: true - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Run E2E Test if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test diff --git a/.github/workflows/e2e.ttl.yaml b/.github/workflows/e2e.ttl.yaml index 3bcb476..88c2e22 100644 --- a/.github/workflows/e2e.ttl.yaml +++ b/.github/workflows/e2e.ttl.yaml @@ -48,14 +48,6 @@ jobs: submodules: true - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Run E2E Test if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index d7ff50a..d9766c2 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -49,14 +49,6 @@ jobs: submodules: true - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Run E2E Test if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test @@ -85,14 +77,6 @@ jobs: submodules: true - name: Set Skip Env Var uses: ./.github/actions/skip - - name: Cache local Maven repository - if: env.SKIP_CI != 'true' - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - name: Run E2E Test if: env.SKIP_CI != 'true' uses: ./.github/actions/e2e-test diff --git a/.github/workflows/plugins-jdk14-test.0.yaml b/.github/workflows/plugins-jdk14-test.0.yaml index f2a5d96..fba4eab 100644 --- a/.github/workflows/plugins-jdk14-test.0.yaml +++ b/.github/workflows/plugins-jdk14-test.0.yaml @@ -51,13 +51,6 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - name: Cache local Maven repository - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - uses: actions/setup-java@v1 with: java-version: 14 diff --git a/.github/workflows/plugins-test.0.yaml b/.github/workflows/plugins-test.0.yaml index 5356fc6..1d6f367 100644 --- a/.github/workflows/plugins-test.0.yaml +++ b/.github/workflows/plugins-test.0.yaml @@ -79,13 +79,6 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - name: Cache local Maven repository - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - uses: actions/setup-java@v1 with: java-version: 8 diff --git a/.github/workflows/plugins-test.1.yaml b/.github/workflows/plugins-test.1.yaml index 67cfb52..7fa9f51 100644 --- a/.github/workflows/plugins-test.1.yaml +++ b/.github/workflows/plugins-test.1.yaml @@ -71,13 +71,6 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - name: Cache local Maven repository - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - uses: actions/setup-java@v1 with: java-version: 8 diff --git a/.github/workflows/plugins-test.2.yaml b/.github/workflows/plugins-test.2.yaml index d4e2058..39982aa 100644 --- a/.github/workflows/plugins-test.2.yaml +++ b/.github/workflows/plugins-test.2.yaml @@ -73,13 +73,6 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - name: Cache local Maven repository - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - uses: actions/setup-java@v1 with: java-version: 8 diff --git a/.github/workflows/plugins-test.3.yaml b/.github/workflows/plugins-test.3.yaml index 2efa6ff..c74e7a4 100644 --- a/.github/workflows/plugins-test.3.yaml +++ b/.github/workflows/plugins-test.3.yaml @@ -82,13 +82,6 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - name: Cache local Maven repository - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - uses: actions/setup-java@v1 with: java-version: 8
