From 0a653c09971e2074a101246803b96e1f1504820f Mon Sep 17 00:00:00 2001 From: Cola Chen <6825116+colachg@users.noreply.github.com> Date: Thu, 26 Feb 2026 20:38:18 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20ci:=20combine=20CI=20and=20CD=20?= =?UTF-8?q?into=20a=20single=20workflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge ci.yml and release.yml into ci-cd.yml with two jobs: - test: runs on PRs and tag pushes - release: runs on v* tags after test passes --- .github/workflows/{release.yml => ci-cd.yml} | 14 +++++++++++++- .github/workflows/ci.yml | 14 -------------- 2 files changed, 13 insertions(+), 15 deletions(-) rename .github/workflows/{release.yml => ci-cd.yml} (85%) delete mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/release.yml b/.github/workflows/ci-cd.yml similarity index 85% rename from .github/workflows/release.yml rename to .github/workflows/ci-cd.yml index 28ef8ca..1c0cf6b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/ci-cd.yml @@ -1,6 +1,8 @@ -name: Release +name: 🚀 CI/CD on: + pull_request: + branches: [main] push: tags: ["v*"] @@ -8,7 +10,17 @@ permissions: contents: write jobs: + test: + runs-on: macos-26 + steps: + - uses: actions/checkout@v6 + + - name: Run tests + run: swift test + release: + if: startsWith(github.ref, 'refs/tags/v') + needs: test runs-on: macos-26 steps: - uses: actions/checkout@v6 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index b02b6af..0000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: CI - -on: - pull_request: - branches: [main] - -jobs: - test: - runs-on: macos-26 - steps: - - uses: actions/checkout@v6 - - - name: Run tests - run: swift test