Skip to content

Commit

Permalink
Revert "[CI] Never skip required matrix-rollup jobs" (open-telemetry#…
Browse files Browse the repository at this point in the history
…12353)

Revert "[CI] Never skip required matrix-rollup jobs (open-telemetry#12296)"

This reverts commit a95ae4a.
  • Loading branch information
mx-psi committed Jul 13, 2022
1 parent 37ec463 commit 081edac
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 97 deletions.
35 changes: 2 additions & 33 deletions .github/workflows/build-and-test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,6 @@ jobs:
- other
runs-on: windows-latest
if: ${{ github.actor != 'dependabot[bot]' }}
outputs:
receiver-0: ${{ steps.result.outputs.receiver-0-out }}
receiver-1: ${{ steps.result.outputs.receiver-1-out }}
processor: ${{ steps.result.outputs.processor-out }}
exporter: ${{ steps.result.outputs.exporter-out }}
extension: ${{ steps.result.outputs.extension-out }}
internal: ${{ steps.result.outputs.internal-out }}
other: ${{ steps.result.outputs.other-out }}
steps:
- name: Checkout Repo
uses: actions/checkout@v3
Expand All @@ -52,32 +44,9 @@ jobs:
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
- name: Run Unit tests
run: make gotest GROUP=${{ matrix.group }}
# By default, the output value is empty. Any failure or cancellation
# will trigger this step, which sets a non-empty output value.
- if: ${{ !success() }}
id: result
name: Denote Failure
run: echo "::set-output name=${{ matrix.group }}-out::1"
windows-unittest:
if: ${{ always() }}
runs-on: windows-latest
needs: [windows-unittest-matrix]
steps:
# If any job failed, echo will produce a non-empty result, triggering failure.
- name: Rollup result
shell: bash
run: |
if [[ $(echo \
${{needs.windows-unittest-matrix.outputs.receiver-0}}\
${{needs.windows-unittest-matrix.outputs.receiver-1}}\
${{needs.windows-unittest-matrix.outputs.processor}}\
${{needs.windows-unittest-matrix.outputs.exporter}}\
${{needs.windows-unittest-matrix.outputs.extension}}\
${{needs.windows-unittest-matrix.outputs.internal}}\
${{needs.windows-unittest-matrix.outputs.other}}) ]]
then
echo "One or more matrix jobs failed."
false
else
echo "All matrix jobs passed!"
fi
- name: Unit Tests Complete
run: echo "Windows unit tests complete"
68 changes: 4 additions & 64 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,6 @@ jobs:
- other
runs-on: ubuntu-latest
needs: [setup-environment]
outputs:
receiver-0: ${{ steps.result.outputs.receiver-0-out }}
receiver-1: ${{ steps.result.outputs.receiver-1-out }}
processor: ${{ steps.result.outputs.processor-out }}
exporter: ${{ steps.result.outputs.exporter-out }}
extension: ${{ steps.result.outputs.extension-out }}
internal: ${{ steps.result.outputs.internal-out }}
other: ${{ steps.result.outputs.other-out }}
steps:
- name: Checkout Repo
uses: actions/checkout@v3
Expand Down Expand Up @@ -100,34 +92,12 @@ jobs:
key: go-lint-build-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
- name: Lint
run: make -j2 golint GROUP=${{ matrix.group }}
# By default, the output value is empty. Any failure or cancellation
# will trigger this step, which sets a non-empty output value.
- if: ${{ !success() }}
id: result
name: Denote Failure
run: echo "::set-output name=${{ matrix.group }}-out::1"
lint:
if: ${{ always() }}
runs-on: ubuntu-latest
needs: [setup-environment, lint-matrix]
steps:
# If any job failed, echo will produce a non-empty result, triggering failure.
- name: Rollup result
run: |
if [[ $(echo \
${{needs.lint-matrix.outputs.receiver-0}}\
${{needs.lint-matrix.outputs.receiver-1}}\
${{needs.lint-matrix.outputs.processor}}\
${{needs.lint-matrix.outputs.exporter}}\
${{needs.lint-matrix.outputs.extension}}\
${{needs.lint-matrix.outputs.internal}}\
${{needs.lint-matrix.outputs.other}}) ]]
then
echo "One or more matrix jobs failed."
false
else
echo "All matrix jobs passed!"
fi
- name: Unit Tests Complete
run: echo "lint complete"
checks:
runs-on: ubuntu-latest
needs: [setup-environment]
Expand Down Expand Up @@ -182,14 +152,6 @@ jobs:
- other
runs-on: ubuntu-latest
needs: [setup-environment]
outputs:
receiver-0: ${{ steps.result.outputs.receiver-0-out }}
receiver-1: ${{ steps.result.outputs.receiver-1-out }}
processor: ${{ steps.result.outputs.processor-out }}
exporter: ${{ steps.result.outputs.exporter-out }}
extension: ${{ steps.result.outputs.extension-out }}
internal: ${{ steps.result.outputs.internal-out }}
other: ${{ steps.result.outputs.other-out }}
steps:
- name: Checkout Repo
uses: actions/checkout@v3
Expand Down Expand Up @@ -218,37 +180,15 @@ jobs:
key: go-test-build-${{ runner.os }}-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
- name: Run Unit Tests
run: make gotest GROUP=${{ matrix.group }}
# By default, the output value is empty. Any failure or cancellation
# will trigger this step, which sets a non-empty output value.
- if: ${{ !success() }}
id: result
name: Denote Failure
run: echo "::set-output name=${{ matrix.group }}-out::1"
unittest:
if: ${{ always() }}
strategy:
matrix:
go-version: [1.18, 1.17]
runs-on: ubuntu-latest
needs: [setup-environment, unittest-matrix]
steps:
# If any job failed, echo will produce a non-empty result, triggering failure.
- name: Rollup result
run: |
if [[ $(echo \
${{needs.unittest-matrix.outputs.receiver-0}}\
${{needs.unittest-matrix.outputs.receiver-1}}\
${{needs.unittest-matrix.outputs.processor}}\
${{needs.unittest-matrix.outputs.exporter}}\
${{needs.unittest-matrix.outputs.extension}}\
${{needs.unittest-matrix.outputs.internal}}\
${{needs.unittest-matrix.outputs.other}}) ]]
then
echo "One or more matrix jobs failed."
false
else
echo "All matrix jobs passed!"
fi
- name: Unit Tests Complete
run: echo "unittest (${{ matrix.go-version }}) complete"

integration-tests:
runs-on: ubuntu-latest
Expand Down

0 comments on commit 081edac

Please sign in to comment.