From 856015d127e0c8a170f692885502ab215ec62a94 Mon Sep 17 00:00:00 2001 From: Timothy Stewart Date: Sun, 29 Oct 2023 14:26:53 -0500 Subject: [PATCH] fix(CI): Break up workflows and use templates --- .github/workflows/molecule-template.yml | 2 +- .github/workflows/test-default.yml | 27 ++++++++----------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/.github/workflows/molecule-template.yml b/.github/workflows/molecule-template.yml index 023c800b5..d1795883b 100644 --- a/.github/workflows/molecule-template.yml +++ b/.github/workflows/molecule-template.yml @@ -1,7 +1,7 @@ --- name: Molecule Template on: - workflow_dispatch: + workflow_call: jobs: molecule: name: Molecule diff --git a/.github/workflows/test-default.yml b/.github/workflows/test-default.yml index ba2450d3b..e3f56fe33 100644 --- a/.github/workflows/test-default.yml +++ b/.github/workflows/test-default.yml @@ -1,21 +1,10 @@ --- name: Test Default -on: - workflow_call: -jobs: - molecule: - name: Molecule - runs-on: macos-12 - strategy: - matrix: - scenario: - - default - fail-fast: false - env: - PYTHON_VERSION: "3.11" - steps: - - name: Check out the codebase - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 - with: - ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/workflows/molecule-template.yml +runs: + using: "composite" + steps: + - name: Check out the codebase + uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v3 2.5.0 + with: + ref: ${{ github.event.pull_request.head.sha }} + - uses: ./.github/workflows/molecule-template.yml