diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 5c3c975..a9d6de3 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -19,7 +19,7 @@ jobs: timeout-minutes: 30 steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: ref: "${{github.event.pull_request.base.sha}}" - name: Check if PR author is a code owner diff --git a/lib/ghb/auto_merge_manager.rb b/lib/ghb/auto_merge_manager.rb index 8c5b03d..b31c071 100644 --- a/lib/ghb/auto_merge_manager.rb +++ b/lib/ghb/auto_merge_manager.rb @@ -31,7 +31,7 @@ def save do_runs_on(DEFAULT_UBUNTU_VERSION) do_step('Checkout') do - do_uses('actions/checkout@v4') + do_uses('actions/checkout@v6') do_with( { ref: '${{github.event.pull_request.base.sha}}' diff --git a/spec/ghb/auto_merge_manager_spec.rb b/spec/ghb/auto_merge_manager_spec.rb index 836a889..c5bb1de 100644 --- a/spec/ghb/auto_merge_manager_spec.rb +++ b/spec/ghb/auto_merge_manager_spec.rb @@ -69,7 +69,7 @@ checkout_step = auto_merge_workflow.jobs[:enable_automerge].steps.find { |s| s.name == 'Checkout' } expect(checkout_step).not_to(be_nil) - expect(checkout_step.uses).to(eq('actions/checkout@v4')) + expect(checkout_step.uses).to(eq('actions/checkout@v6')) expect(checkout_step.with[:ref]).to(eq('${{github.event.pull_request.base.sha}}')) end