You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2020/04/28 12:33:15 UTC
[skywalking] branch master updated: Use the built-in ability to
check out submodules (#4728)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 4a8f86f Use the built-in ability to check out submodules (#4728)
4a8f86f is described below
commit 4a8f86f817cf99e4c861ec5214a0ea789f15d503
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Tue Apr 28 20:32:56 2020 +0800
Use the built-in ability to check out submodules (#4728)
---
.github/workflows/ci-it.yaml | 23 +++++++----------------
.github/workflows/docker-ci.yaml | 12 ++++--------
.github/workflows/e2e.cluster.yaml | 7 ++-----
.github/workflows/e2e.go.yaml | 7 ++-----
.github/workflows/e2e.jdk-versions.yaml | 7 ++-----
.github/workflows/e2e.php.yaml | 7 ++-----
.github/workflows/e2e.profiling.yaml | 7 ++-----
.github/workflows/e2e.storages.yaml | 7 ++-----
.github/workflows/e2e.ttl.yaml | 7 ++-----
.github/workflows/e2e.yaml | 21 ++++++---------------
.github/workflows/istio-mixer-ci.yaml | 8 ++------
.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 | 16 +++++-----------
15 files changed, 44 insertions(+), 106 deletions(-)
diff --git a/.github/workflows/ci-it.yaml b/.github/workflows/ci-it.yaml
index a407ab7..a733599 100644
--- a/.github/workflows/ci-it.yaml
+++ b/.github/workflows/ci-it.yaml
@@ -19,7 +19,7 @@ name: CI AND IT
on:
pull_request:
push:
- branches:
+ branches:
- master
tags:
- 'v*'
@@ -34,11 +34,8 @@ jobs:
timeout-minutes: 90
steps:
- uses: actions/checkout@v2
- - name: checkout submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- uses: actions/setup-java@v1
with:
java-version: 8
@@ -54,11 +51,8 @@ jobs:
timeout-minutes: 90
steps:
- uses: actions/checkout@v2
- - name: checkout submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- uses: actions/setup-java@v1
with:
java-version: 8
@@ -71,11 +65,8 @@ jobs:
timeout-minutes: 90
steps:
- uses: actions/checkout@v2
- - name: checkout submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- uses: actions/setup-java@v1
with:
java-version: 8
diff --git a/.github/workflows/docker-ci.yaml b/.github/workflows/docker-ci.yaml
index c1202c7..adc832f 100644
--- a/.github/workflows/docker-ci.yaml
+++ b/.github/workflows/docker-ci.yaml
@@ -30,12 +30,8 @@ jobs:
es: [es6, es7]
steps:
- uses: actions/checkout@v2
- # In the checkout@v2, it doesn't support git submodule. Execute the commands manually.
- - name: checkout submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- uses: actions/cache@v1
with:
path: ~/.m2/repository
@@ -47,8 +43,8 @@ jobs:
- name: Bootstrap cluster
run: |
case ${{ matrix.es }} in
- es6) export ES_TAG=6.8.1 ;;
- es7) export ES_TAG=7.5.0 ;;
+ es6) export ES_TAG=6.8.1 ;;
+ es7) export ES_TAG=7.5.0 ;;
esac
export TAG=${{ matrix.es }}
diff --git a/.github/workflows/e2e.cluster.yaml b/.github/workflows/e2e.cluster.yaml
index 53ec555..9dd51b7 100644
--- a/.github/workflows/e2e.cluster.yaml
+++ b/.github/workflows/e2e.cluster.yaml
@@ -43,11 +43,8 @@ jobs:
SW_STORAGE: ${{ matrix.storage }}
steps:
- uses: actions/checkout@v2
- - name: checkout submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- name: Compile and Build
run: make docker && ES_VERSION=es7 TAG=latest-es7 make docker.oap
- name: Copy dist package
diff --git a/.github/workflows/e2e.go.yaml b/.github/workflows/e2e.go.yaml
index ac461fc..1a0b19a 100644
--- a/.github/workflows/e2e.go.yaml
+++ b/.github/workflows/e2e.go.yaml
@@ -35,11 +35,8 @@ jobs:
timeout-minutes: 90
steps:
- uses: actions/checkout@v2
- - name: checkout submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- name: Compile and Build
run: make docker
- name: Copy dist package
diff --git a/.github/workflows/e2e.jdk-versions.yaml b/.github/workflows/e2e.jdk-versions.yaml
index 272c1b1..7b622fc 100644
--- a/.github/workflows/e2e.jdk-versions.yaml
+++ b/.github/workflows/e2e.jdk-versions.yaml
@@ -42,11 +42,8 @@ jobs:
SW_OAP_BASE_IMAGE: adoptopenjdk/openjdk${{ matrix.jdk }}:alpine
steps:
- uses: actions/checkout@v2
- - name: Checkout Submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- name: Set Up Java
uses: actions/setup-java@v1
with:
diff --git a/.github/workflows/e2e.php.yaml b/.github/workflows/e2e.php.yaml
index bd552e3..9dac231 100644
--- a/.github/workflows/e2e.php.yaml
+++ b/.github/workflows/e2e.php.yaml
@@ -35,11 +35,8 @@ jobs:
timeout-minutes: 90
steps:
- uses: actions/checkout@v2
- - name: checkout submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- name: Compile and Build
run: make docker
- name: Copy dist package
diff --git a/.github/workflows/e2e.profiling.yaml b/.github/workflows/e2e.profiling.yaml
index 59d4546..6be2418 100644
--- a/.github/workflows/e2e.profiling.yaml
+++ b/.github/workflows/e2e.profiling.yaml
@@ -41,11 +41,8 @@ jobs:
SW_STORAGE: ${{ matrix.storage }}
steps:
- uses: actions/checkout@v2
- - name: checkout submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- name: Compile and Build
run: make docker && ES_VERSION=es7 TAG=latest-es7 make docker.oap
- name: Copy dist package
diff --git a/.github/workflows/e2e.storages.yaml b/.github/workflows/e2e.storages.yaml
index d74e865..1fb1711 100644
--- a/.github/workflows/e2e.storages.yaml
+++ b/.github/workflows/e2e.storages.yaml
@@ -41,11 +41,8 @@ jobs:
SW_STORAGE: ${{ matrix.storage }}
steps:
- uses: actions/checkout@v2
- - name: Checkout Submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- name: Compile and Build
run: make docker && ES_VERSION=es7 TAG=latest-es7 make docker.oap
- name: Copy dist package
diff --git a/.github/workflows/e2e.ttl.yaml b/.github/workflows/e2e.ttl.yaml
index 9f9e398..1a723e6 100644
--- a/.github/workflows/e2e.ttl.yaml
+++ b/.github/workflows/e2e.ttl.yaml
@@ -41,11 +41,8 @@ jobs:
SW_STORAGE: ${{ matrix.storage }}
steps:
- uses: actions/checkout@v2
- - name: checkout submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- name: Compile and Build
run: make docker && ES_VERSION=es7 TAG=latest-es7 make docker.oap
- name: Copy dist package
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 82213fe..d022497 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -41,11 +41,8 @@ jobs:
SW_SIMPLE_CASE: ${{ matrix.case }}
steps:
- uses: actions/checkout@v2
- - name: Checkout Submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- name: Compile and Build
run: make docker
- name: Copy dist package
@@ -66,11 +63,8 @@ jobs:
timeout-minutes: 90
steps:
- uses: actions/checkout@v2
- - name: checkout submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- name: Compile and Build
run: make docker
- name: Copy dist package
@@ -91,11 +85,8 @@ jobs:
timeout-minutes: 90
steps:
- uses: actions/checkout@v2
- - name: checkout submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- name: Compile and Build
run: make docker
- name: Copy dist package
diff --git a/.github/workflows/istio-mixer-ci.yaml b/.github/workflows/istio-mixer-ci.yaml
index 82b4d2c..5954bf5 100644
--- a/.github/workflows/istio-mixer-ci.yaml
+++ b/.github/workflows/istio-mixer-ci.yaml
@@ -33,12 +33,8 @@ jobs:
runs-on: ubuntu-16.04
steps:
- uses: actions/checkout@v2
- # In the checkout@v2, it doesn't support git submodule. Execute the commands manually.
- - name: checkout submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- name: Prepare enviroment
run: |
bash ${SCRIPTS_DIR}/pre.sh
diff --git a/.github/workflows/plugins-test.0.yaml b/.github/workflows/plugins-test.0.yaml
index 8b4b00e..7effcb0 100644
--- a/.github/workflows/plugins-test.0.yaml
+++ b/.github/workflows/plugins-test.0.yaml
@@ -56,11 +56,8 @@ jobs:
- { name: 'gson-scenario', title: 'Gson (7)' }
steps:
- uses: actions/checkout@v2
- - name: checkout submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- 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 20e4eaa..a05aa43 100644
--- a/.github/workflows/plugins-test.1.yaml
+++ b/.github/workflows/plugins-test.1.yaml
@@ -50,11 +50,8 @@ jobs:
- { name: 'postgresql-above9.4.1207-scenario', title: 'PostgreSQL 9.4.1207+ (62)' }
steps:
- uses: actions/checkout@v2
- - name: checkout submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- 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 ce041df..404c69a 100644
--- a/.github/workflows/plugins-test.2.yaml
+++ b/.github/workflows/plugins-test.2.yaml
@@ -56,11 +56,8 @@ jobs:
- { name: 'struts2.5-scenario', title: 'Struts2.5 (14)' }
steps:
- uses: actions/checkout@v2
- - name: checkout submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- 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 dbd4d12..96f0458 100644
--- a/.github/workflows/plugins-test.3.yaml
+++ b/.github/workflows/plugins-test.3.yaml
@@ -42,14 +42,11 @@ jobs:
- { name: 'spring-4.3.x-scenario', title: 'Spring 4.3.x-5.2.x (54)' }
- { name: 'spring-async-scenario', title: 'Spring Async 4.3.x-5.1.x (35)' }
- { name: 'vertx-eventbus-3.x-scenario', title: 'Vert.x EventBus 3.2.x-3.7.x (19)' }
- - { name: 'vertx-web-3.x-scenario', title: 'Vert.x Web 3.0.x-3.7.x (21)' }
+ - { name: 'vertx-web-3.x-scenario', title: 'Vert.x Web 3.0.x-3.7.x (21)' }
steps:
- uses: actions/checkout@v2
- - name: checkout submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- uses: actions/setup-java@v1
with:
java-version: 8
@@ -68,11 +65,8 @@ jobs:
timeout-minutes: 90
steps:
- uses: actions/checkout@v2
- - name: checkout submodules
- shell: bash
- run: |
- git submodule sync --recursive
- git -c protocol.version=2 submodule update --init --force --recursive --depth=1
+ with:
+ submodules: true
- uses: actions/setup-java@v1
with:
java-version: 8