From eccca8506f83715d44372d6011f9f1f804bad225 Mon Sep 17 00:00:00 2001 From: kezhenxu94 Date: Thu, 17 Mar 2022 11:29:37 +0800 Subject: [PATCH] Remove fake required workflows (#8692) --- .github/workflows/skywalking-fake.yaml | 1 + .github/workflows/skywalking.yaml | 84 +++----------------------- 2 files changed, 11 insertions(+), 74 deletions(-) diff --git a/.github/workflows/skywalking-fake.yaml b/.github/workflows/skywalking-fake.yaml index 1a0b76b1a1..d1738f4441 100644 --- a/.github/workflows/skywalking-fake.yaml +++ b/.github/workflows/skywalking-fake.yaml @@ -19,6 +19,7 @@ name: CI on: pull_request: paths-ignore: + - "**" - "!*.md" - "!*.txt" - "!skywalking-ui" diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index 0b21754a89..4af8000a67 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -541,88 +541,24 @@ jobs: with: e2e-file: $GITHUB_WORKSPACE/test/e2e-v2/cases/simple/jdk/e2e.yaml - ci: - if: (github.event_name == 'schedule' && github.repository == 'apache/skywalking') || (github.event_name != 'schedule') - name: CI - needs: [ unit-test, integration-test ] - runs-on: ubuntu-latest - timeout-minutes: 10 - steps: - - name: Merge Requirement - run: | - if [[ ${{ needs.unit-test.result }} != 'success' ]]; then - exit -1 - fi - if [[ ${{ needs.integration-test.result }} != 'success' ]]; then - exit -1 - fi - - single: - if: (github.event_name == 'schedule' && github.repository == 'apache/skywalking') || (github.event_name != 'schedule') - name: Single - needs: [ e2e-test, e2e-test-istio, e2e-test-java-versions ] - runs-on: ubuntu-latest - timeout-minutes: 10 - steps: - - name: Merge Requirement - run: | - if [[ ${{ needs.e2e-test.result }} != 'success' ]]; then - exit -1 - fi - if [[ ${{ needs.e2e-test-istio.result }} != 'success' ]]; then - exit -1 - fi - if [[ ${{ needs.e2e-test-java-versions.result }} != 'success' ]]; then - exit -1 - fi - - cluster: - if: (github.event_name == 'schedule' && github.repository == 'apache/skywalking') || (github.event_name != 'schedule') - name: Cluster - needs: [ e2e-test, e2e-test-istio, e2e-test-java-versions ] - runs-on: ubuntu-latest - timeout-minutes: 10 - steps: - - name: Merge Requirement - run: | - if [[ ${{ needs.e2e-test.result }} != 'success' ]]; then - exit -1 - fi - if [[ ${{ needs.e2e-test-istio.result }} != 'success' ]]; then - exit -1 - fi - if [[ ${{ needs.e2e-test-java-versions.result }} != 'success' ]]; then - exit -1 - fi - - storage: - if: (github.event_name == 'schedule' && github.repository == 'apache/skywalking') || (github.event_name != 'schedule') - name: Storage - needs: [ e2e-test, e2e-test-istio, e2e-test-java-versions ] - runs-on: ubuntu-latest - timeout-minutes: 10 - steps: - - name: Merge Requirement - run: | - if [[ ${{ needs.e2e-test.result }} != 'success' ]]; then - exit -1 - fi - if [[ ${{ needs.e2e-test-istio.result }} != 'success' ]]; then - exit -1 - fi - if [[ ${{ needs.e2e-test-java-versions.result }} != 'success' ]]; then - exit -1 - fi - required: if: always() name: Required - needs: [ unit-test, integration-test, e2e-test, e2e-test-istio, e2e-test-java-versions ] + needs: + - dependency-license + - unit-test + - integration-test + - e2e-test + - e2e-test-istio + - e2e-test-java-versions runs-on: ubuntu-latest timeout-minutes: 10 steps: - name: Merge Requirement run: | + if [[ ${{ needs.dependency-license.result }} != 'success' ]]; then + exit -1 + fi if [[ ${{ needs.unit-test.result }} != 'success' ]]; then exit -1 fi -- GitLab