diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index faea7e2..8bb63f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,4 +39,4 @@ jobs: uses: kurocado-studio/styleguide/.github/workflows/workflow.release.yml@main secrets: inherit with: - branch_name: ${{ github.ref }} + branch_name: ${{ github.ref_name }} diff --git a/.github/workflows/workflow.deploy.yml b/.github/workflows/workflow.deploy.yml index 22ad8c0..e6e2d16 100644 --- a/.github/workflows/workflow.deploy.yml +++ b/.github/workflows/workflow.deploy.yml @@ -8,6 +8,10 @@ # on: workflow_call: + inputs: + branch_name: + required: true + type: string secrets: fly_api_token: required: true @@ -16,8 +20,8 @@ jobs: deploy: runs-on: ubuntu-latest if: | - github.ref == 'refs/heads/main' || - github.ref == 'refs/heads/dev' + inputs.branch_name == 'main' || + inputs.branch_name == 'dev' steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/workflow.document.yml b/.github/workflows/workflow.document.yml index 5c69f25..5eab72f 100644 --- a/.github/workflows/workflow.document.yml +++ b/.github/workflows/workflow.document.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest if: | github.event_name == 'push' && - github.ref == 'refs/heads/main' + github.ref_name == 'main' outputs: writerside_changed: ${{ steps.check.outputs.writerside_changed }} steps: diff --git a/.github/workflows/workflow.release.yml b/.github/workflows/workflow.release.yml index 1b290a9..6778beb 100644 --- a/.github/workflows/workflow.release.yml +++ b/.github/workflows/workflow.release.yml @@ -23,11 +23,11 @@ jobs: runs-on: ubuntu-latest if: | ( - inputs.branch_name == 'refs/heads/main' || - inputs.branch_name == 'refs/heads/alpha' || - inputs.branch_name == 'refs/heads/beta' || - inputs.branch_name == 'refs/heads/canary' || - inputs.branch_name == 'refs/heads/pre/rc' + inputs.branch_name == 'main' || + inputs.branch_name == 'alpha' || + inputs.branch_name == 'beta' || + inputs.branch_name == 'canary' || + inputs.branch_name == 'pre/rc' ) steps: - name: Checkout