From a4e3cb17371475428c964206cbfd97f3cb0f57cb Mon Sep 17 00:00:00 2001 From: Ralph Drake Date: Fri, 22 Dec 2023 11:59:29 -0500 Subject: [PATCH] fix (ci): make inheretance sensible --- .github/workflows/{build.yml => _build.yml} | 9 --------- .github/workflows/{lint.yml => _lint.yml} | 0 .github/workflows/push.yml | 15 +++++++++++++++ .github/workflows/release.yml | 10 +++++++++- 4 files changed, 24 insertions(+), 10 deletions(-) rename .github/workflows/{build.yml => _build.yml} (58%) rename .github/workflows/{lint.yml => _lint.yml} (100%) create mode 100644 .github/workflows/push.yml diff --git a/.github/workflows/build.yml b/.github/workflows/_build.yml similarity index 58% rename from .github/workflows/build.yml rename to .github/workflows/_build.yml index e3bd014..b78120a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/_build.yml @@ -1,20 +1,11 @@ name: Build on: - push: - # release pipeline calls build so don't run it twice - branches-ignore: ["main"] - pull_request: workflow_call: jobs: - lint: - uses: ./.github/workflows/lint.yml - docker: runs-on: ubuntu-latest - needs: - - lint steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/lint.yml b/.github/workflows/_lint.yml similarity index 100% rename from .github/workflows/lint.yml rename to .github/workflows/_lint.yml diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml new file mode 100644 index 0000000..37d2276 --- /dev/null +++ b/.github/workflows/push.yml @@ -0,0 +1,15 @@ +name: Push + +on: + push: + # release pipeline runs on push to main with same jobs + branches-ignore: ["main"] + pull_request: + +jobs: + lint: + uses: "./.github/workflows/_lint.yml" + + build: + uses: "./.github/workflows/_build.yml" + needs: ["lint"] diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 63aff0f..c738e40 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,7 +6,15 @@ on: tags: ["**"] jobs: - ghcr: + lint: + uses: "./.github/workflows/_lint.yml" + + build: + uses: "./.github/workflows/_build.yml" + needs: ["lint"] + + publish: + needs: ["build"] runs-on: ubuntu-latest permissions: packages: write