From 4a847c9b8c774d4d7b7786ef5219c92f00783862 Mon Sep 17 00:00:00 2001 From: Moritz Wiesinger Date: Wed, 24 Jul 2024 13:45:05 +0200 Subject: [PATCH] move pipeline code to separate workflow Signed-off-by: Moritz Wiesinger --- .github/workflows/ci-goreleaser-contrib.yaml | 31 ++++---------------- .github/workflows/ci-goreleaser-core.yaml | 31 ++++---------------- 2 files changed, 12 insertions(+), 50 deletions(-) diff --git a/.github/workflows/ci-goreleaser-contrib.yaml b/.github/workflows/ci-goreleaser-contrib.yaml index 8dda8c33..0a954c84 100644 --- a/.github/workflows/ci-goreleaser-contrib.yaml +++ b/.github/workflows/ci-goreleaser-contrib.yaml @@ -32,29 +32,10 @@ jobs: goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x" ]' secrets: inherit -# package-tests: -# name: Package tests -# needs: check-goreleaser -# uses: ./.github/workflows/package-test.yaml -# with: -# distribution: otelcol -# type: '[ "deb", "rpm" ]' package-tests: - name: Package Tests - runs-on: ubuntu-latest - needs: check-goreleaser - strategy: - matrix: - type: ["deb", "rpm"] - steps: - - name: Checkout - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - - name: Download built artifacts - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 - with: - name: linux-packages - - - name: Test ${{ matrix.type }} package - run: ./scripts/package-tests/package-tests.sh ./otelcol*-SNAPSHOT-*_linux_amd64.${{ matrix.type }} otelcol-contrib - + name: Package tests + needs: check-goreleaser + uses: ./.github/workflows/package-test.yaml + with: + distribution: otelcol-contrib + type: '[ "deb", "rpm" ]' diff --git a/.github/workflows/ci-goreleaser-core.yaml b/.github/workflows/ci-goreleaser-core.yaml index e1694ac4..04b615a7 100644 --- a/.github/workflows/ci-goreleaser-core.yaml +++ b/.github/workflows/ci-goreleaser-core.yaml @@ -33,29 +33,10 @@ jobs: goarch: '[ "386", "amd64", "arm64", "ppc64le", "arm", "s390x" ]' secrets: inherit -# package-tests: -# name: Package tests -# needs: check-goreleaser -# uses: ./.github/workflows/package-test.yaml -# with: -# distribution: otelcol -# type: '[ "deb", "rpm" ]' package-tests: - name: Package Tests - runs-on: ubuntu-latest - needs: check-goreleaser - strategy: - matrix: - type: ["deb", "rpm"] - steps: - - name: Checkout - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - - name: Download built artifacts - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 - with: - name: linux-packages - - - name: Test ${{ matrix.type }} package - run: ./scripts/package-tests/package-tests.sh ./otelcol*-SNAPSHOT-*_linux_amd64.${{ matrix.type }} otelcol - + name: Package tests + needs: check-goreleaser + uses: ./.github/workflows/package-test.yaml + with: + distribution: otelcol + type: '[ "deb", "rpm" ]'