From 57de948ac067fbcce38fff2c6aa87251a1511fe2 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Fri, 9 Jun 2023 09:28:48 -0400 Subject: [PATCH] chore: refactor github directory files Signed-off-by: Devin Buhl --- .github/{workflows => actions}/docker-image.yaml | 0 .github/{workflows => actions}/go-release.yaml | 0 .github/{workflows => actions}/tests.yaml | 0 .github/workflows/ci.yml | 5 ++--- .github/workflows/release.yml | 12 +++++------- 5 files changed, 7 insertions(+), 10 deletions(-) rename .github/{workflows => actions}/docker-image.yaml (100%) rename .github/{workflows => actions}/go-release.yaml (100%) rename .github/{workflows => actions}/tests.yaml (100%) diff --git a/.github/workflows/docker-image.yaml b/.github/actions/docker-image.yaml similarity index 100% rename from .github/workflows/docker-image.yaml rename to .github/actions/docker-image.yaml diff --git a/.github/workflows/go-release.yaml b/.github/actions/go-release.yaml similarity index 100% rename from .github/workflows/go-release.yaml rename to .github/actions/go-release.yaml diff --git a/.github/workflows/tests.yaml b/.github/actions/tests.yaml similarity index 100% rename from .github/workflows/tests.yaml rename to .github/actions/tests.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbed56f..ed647f9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,9 +12,8 @@ on: jobs: go-tests: - uses: ./.github/workflows/tests.yaml + uses: ./.github/actions/tests.yaml build: needs: go-tests - if: "!contains(github.event.head_commit.message, '[ci-skip]')" - uses: ./.github/workflows/docker-image.yaml + uses: ./.github/actions/docker-image.yaml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 01908ba..f859320 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,19 +1,17 @@ +--- name: release on: push: tags: - - v*.*.* + - v* jobs: go-tests: - if: "!contains(github.event.head_commit.message, '[ci-skip]')" - uses: ./.github/workflows/tests.yaml + uses: ./.github/actions/tests.yaml container-release: - if: "!contains(github.event.head_commit.message, '[ci-skip]')" - uses: ./.github/workflows/docker-image.yaml + uses: ./.github/actions/docker-image.yaml go-release: - if: "!contains(github.event.head_commit.message, '[ci-skip]')" - uses: ./.github/workflows/go-release.yaml + uses: ./.github/actions/go-release.yaml