diff --git a/.github/workflows/cd-beta.yaml b/.github/workflows/cd-beta.yaml index dae28089..94a6a584 100644 --- a/.github/workflows/cd-beta.yaml +++ b/.github/workflows/cd-beta.yaml @@ -2,11 +2,11 @@ name: CD(beta) run-name: CD(beta) - ${{ github.event_name }} on: -# pull_request: -# branches: -# - develop -# types: -# - closed + # pull_request: + # branches: + # - develop + # types: + # - closed workflow_dispatch: inputs: @@ -24,7 +24,7 @@ on: jobs: push-image: if: github.event.pull_request.merged == true || github.event.inputs.deploy-only == 'false' - runs-on: [self-hosted, garm] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 with: @@ -72,7 +72,7 @@ jobs: cache-to: type=gha,mode=max deploy: - runs-on: [self-hosted, garm] + runs-on: ubuntu-latest needs: push-image if: | (github.event.pull_request.merged == true && always() && !failure() && !cancelled()) || @@ -128,7 +128,7 @@ jobs: VERIFY_SSL: "true" notify: - runs-on: [self-hosted, garm] + runs-on: ubuntu-latest needs: [push-image, deploy] if: always() && !cancelled() steps: diff --git a/.github/workflows/cd-staging.yaml b/.github/workflows/cd-staging.yaml index a6be6360..066824b4 100644 --- a/.github/workflows/cd-staging.yaml +++ b/.github/workflows/cd-staging.yaml @@ -24,7 +24,7 @@ on: jobs: push-image: if: github.event.pull_request.merged == true || github.event.inputs.deploy-only == 'false' - runs-on: [self-hosted, garm] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 with: @@ -75,7 +75,7 @@ jobs: cache-to: type=gha,mode=max deploy: - runs-on: [self-hosted, garm] + runs-on: ubuntu-latest needs: push-image if: | (github.event.pull_request.merged == true && always() && !failure() && !cancelled()) || @@ -131,7 +131,7 @@ jobs: VERIFY_SSL: "true" notify: - runs-on: [self-hosted, garm] + runs-on: ubuntu-latest needs: [push-image, deploy] if: always() && !cancelled() steps: @@ -146,4 +146,4 @@ jobs: color: 0x0000ff url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" username: GitHub Actions - avatar_url: https://r2.sohosai.com/logo.png + avatar_url: https://r2.sohosai.com/logo.png diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index e5edd21b..d7ffa983 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -23,7 +23,7 @@ on: jobs: push-image: if: github.event.pull_request.merged == true || github.event.inputs.deploy-only == 'false' - runs-on: [self-hosted, garm] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 with: @@ -71,8 +71,8 @@ jobs: cache-to: type=gha,mode=max deploy: - runs-on: [self-hosted, garm] needs: push-image + runs-on: ubuntu-latest if: | (github.event.pull_request.merged == true && always() && !failure() && !cancelled()) || (github.event.inputs.push-image-only == 'false' && always() && !failure() && !cancelled()) @@ -129,7 +129,7 @@ jobs: rm .env" notify: - runs-on: [self-hosted, garm] + runs-on: ubuntu-latest needs: [push-image, deploy] if: always() && !cancelled() steps: @@ -144,4 +144,4 @@ jobs: color: 0x0000ff url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" username: GitHub Actions - avatar_url: https://r2.sohosai.com/logo.png + avatar_url: https://r2.sohosai.com/logo.png diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7febb317..0330bc6b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: [self-hosted, garm] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: Symlink