Skip to content

Port v6 cleanup to v4 #2305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Nov 13, 2025
Merged

Port v6 cleanup to v4 #2305

merged 1 commit into from
Nov 13, 2025
+657 −2

Conversation

@ericsciple
Copy link
Contributor

@ericsciple ericsciple commented Nov 13, 2025 •
edited
Loading

Auth configuration changed in actions/checkout@v6-beta. This PR ports the cleanup for v6-style configuration to v4.

Otherwise, actions/checkout@v4 will fail if the same repo is already checked out by actions/checkout@v6-beta, in the same job, to the same path. Although this scenario is likely very uncommon, I want to reduce friction for users to move to v6.

For quick mitigation if something goes wrong, ACTIONS_CHECKOUT_SKIP_V6_CLEANUP can be set to 1 or true to skip the new cleanup logic.

Workflow for testing the changes E2E 
name: Test Checkout Cleanup

on:
  workflow_dispatch:
  push:
    paths:
      - .github/workflows/test-checkout-cleanup-v4.yml

env:
  ACTIONS_CHECKOUT_SKIP_V6_CLEANUP: true

jobs:
  checkout-v4-then-v6-beta:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout with v4
        uses: actions/checkout@v4
      
      - name: Checkout with v6-beta
        uses: actions/checkout@v6-beta

  checkout-v6-beta-then-v4:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout with v6-beta
        uses: actions/checkout@v6-beta
      
      - name: Checkout with v4
        uses: actions/checkout@v4

  checkout-25-11-clean2-then-v6-beta:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout with 25-11-clean2
        uses: actions/checkout@users/ericsciple/25-11-clean2
      
      - name: Checkout with v6-beta
        uses: actions/checkout@v6-beta

  checkout-v6-beta-then-25-11-clean2:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout with v6-beta
        uses: actions/checkout@v6-beta
      
      - name: Checkout with 25-11-clean2
        uses: actions/checkout@users/ericsciple/25-11-clean2

  checkout-v4-then-v6-beta-submodules:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout with v4
        uses: actions/checkout@v4
        with:
          ref: submodule-test
          submodules: recursive
      
      - name: Checkout with v6-beta
        uses: actions/checkout@v6-beta
        with:
          ref: submodule-test
          submodules: recursive

  checkout-v6-beta-then-v4-submodules:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout with v6-beta
        uses: actions/checkout@v6-beta
        with:
          ref: submodule-test
          submodules: recursive
      
      - name: Checkout with v4
        uses: actions/checkout@v4
        with:
          ref: submodule-test
          submodules: recursive

  checkout-25-11-clean2-then-v6-beta-submodules:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout with 25-11-clean2
        uses: actions/checkout@users/ericsciple/25-11-clean2
        with:
          ref: submodule-test
          submodules: recursive
      
      - name: Checkout with v6-beta
        uses: actions/checkout@v6-beta
        with:
          ref: submodule-test
          submodules: recursive

  checkout-v6-beta-then-25-11-clean2-submodules:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout with v6-beta
        uses: actions/checkout@v6-beta
        with:
          ref: submodule-test
          submodules: recursive
      
      - name: Checkout with 25-11-clean2
        uses: actions/checkout@users/ericsciple/25-11-clean2
        with:
          ref: submodule-test
          submodules: recursive

  checkout-v4-then-v6-beta-submodules-true:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout with v4
        uses: actions/checkout@v4
        with:
          ref: submodule-test
          submodules: true
      
      - name: Checkout with v6-beta
        uses: actions/checkout@v6-beta
        with:
          ref: submodule-test
          submodules: true

  checkout-v6-beta-then-v4-submodules-true:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout with v6-beta
        uses: actions/checkout@v6-beta
        with:
          ref: submodule-test
          submodules: true
      
      - name: Checkout with v4
        uses: actions/checkout@v4
        with:
          ref: submodule-test
          submodules: true

  checkout-25-11-clean2-then-v6-beta-submodules-true:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout with 25-11-clean2
        uses: actions/checkout@users/ericsciple/25-11-clean2
        with:
          ref: submodule-test
          submodules: true
      
      - name: Checkout with v6-beta
        uses: actions/checkout@v6-beta
        with:
          ref: submodule-test
          submodules: true

  checkout-v6-beta-then-25-11-clean2-submodules-true:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout with v6-beta
        uses: actions/checkout@v6-beta
        with:
          ref: submodule-test
          submodules: true
      
      - name: Checkout with 25-11-clean2
        uses: actions/checkout@users/ericsciple/25-11-clean2
        with:
          ref: submodule-test
          submodules: true

Related PRs:

@ericsciple ericsciple changed the title Cleanup actions/checkout@v6 auth style Port v6 cleanup to v4 Nov 13, 2025
@ericsciple ericsciple marked this pull request as ready for review November 13, 2025 23:01
@ericsciple ericsciple merged commit 34e1148 into releases/v4 Nov 13, 2025
9 checks passed
@ericsciple ericsciple deleted the users/ericsciple/25-11-clean2 branch November 13, 2025 23:20
CosmicJesterX
CosmicJesterX reviewed Nov 14, 2025
View reviewed changes
Copy link

@CosmicJesterX CosmicJesterX left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hi

renovate bot added a commit to andrei-picus-tink/auto-renovate that referenced this pull request Nov 19, 2025
@renovate
Update actions/checkout action to v4.3.1
ab84bcb 
| datasource  | package          | from   | to     |
| ----------- | ---------------- | ------ | ------ |
| github-tags | actions/checkout | v4.1.7 | v4.3.1 |


## [vv4.3.1](https://github.com/actions/checkout/releases/tag/v4.3.1)

##### What's Changed

- Port v6 cleanup to v4 by [@ericsciple](https://github.com/ericsciple) in [#2305](actions/checkout#2305)

**Full Changelog**: <actions/checkout@v4...v4.3.1>


## [vv4.3.0](https://github.com/actions/checkout/releases/tag/v4.3.0)

##### What's Changed

- docs: update README.md by [@motss](https://github.com/motss) in [#1971](actions/checkout#1971)
- Add internal repos for checking out multiple repositories by [@mouismail](https://github.com/mouismail) in [#1977](actions/checkout#1977)
- Documentation update - add recommended permissions to Readme by [@benwells](https://github.com/benwells) in [#2043](actions/checkout#2043)
- Adjust positioning of user email note and permissions heading by [@joshmgross](https://github.com/joshmgross) in [#2044](actions/checkout#2044)
- Update README.md by [@nebuk89](https://github.com/nebuk89) in [#2194](actions/checkout#2194)
- Update CODEOWNERS for actions by [@TingluoHuang](https://github.com/TingluoHuang) in [#2224](actions/checkout#2224)
- Update package dependencies by [@salmanmkc](https://github.com/salmanmkc) in [#2236](actions/checkout#2236)
- Prepare release v4.3.0 by [@salmanmkc](https://github.com/salmanmkc) in [#2237](actions/checkout#2237)

##### New Contributors

- [@motss](https://github.com/motss) made their first contribution in [#1971](actions/checkout#1971)
- [@mouismail](https://github.com/mouismail) made their first contribution in [#1977](actions/checkout#1977)
- [@benwells](https://github.com/benwells) made their first contribution in [#2043](actions/checkout#2043)
- [@nebuk89](https://github.com/nebuk89) made their first contribution in [#2194](actions/checkout#2194)
- [@salmanmkc](https://github.com/salmanmkc) made their first contribution in [#2236](actions/checkout#2236)

**Full Changelog**: <actions/checkout@v4...v4.3.0>


## [vv4.2.2](https://github.com/actions/checkout/blob/HEAD/CHANGELOG.md#v422)

- `url-helper.ts` now leverages well-known environment variables by [@jww3](https://github.com/jww3) in [#1941](actions/checkout#1941)
- Expand unit test coverage for `isGhes` by [@jww3](https://github.com/jww3) in [#1946](actions/checkout#1946)


## [vv4.2.1](https://github.com/actions/checkout/blob/HEAD/CHANGELOG.md#v421)

- Check out other refs/\* by commit if provided, fall back to ref by [@orhantoy](https://github.com/orhantoy) in [#1924](actions/checkout#1924)


## [vv4.2.0](https://github.com/actions/checkout/blob/HEAD/CHANGELOG.md#v420)

- Add Ref and Commit outputs by [@lucacome](https://github.com/lucacome) in [#1180](actions/checkout#1180)
- Dependency updates by [@dependabot-](https://github.com/dependabot-) [#1777](actions/checkout#1777), [#1872](actions/checkout#1872)
renovate bot added a commit to andrei-picus-tink/auto-renovate that referenced this pull request Nov 19, 2025
@renovate
Update actions/checkout action to v5
c4e1f62 
| datasource  | package          | from   | to     |
| ----------- | ---------------- | ------ | ------ |
| github-tags | actions/checkout | v4.1.7 | v5.0.1 |


## [vv5.0.1](https://github.com/actions/checkout/releases/tag/v5.0.1)

##### What's Changed

- Port v6 cleanup to v5 by [@ericsciple](https://github.com/ericsciple) in [#2301](actions/checkout#2301)

**Full Changelog**: <actions/checkout@v5...v5.0.1>


## [vv5.0.0](https://github.com/actions/checkout/releases/tag/v5.0.0)

##### What's Changed

- Update actions checkout to use node 24 by [@salmanmkc](https://github.com/salmanmkc) in [#2226](actions/checkout#2226)
- Prepare v5.0.0 release by [@salmanmkc](https://github.com/salmanmkc) in [#2238](actions/checkout#2238)

##### ⚠️ Minimum Compatible Runner Version

**v2.327.1**\
[Release Notes](https://github.com/actions/runner/releases/tag/v2.327.1)

Make sure your runner is updated to this version or newer to use this release.

**Full Changelog**: <actions/checkout@v4...v5.0.0>


## [vv4.3.1](https://github.com/actions/checkout/releases/tag/v4.3.1)

##### What's Changed

- Port v6 cleanup to v4 by [@ericsciple](https://github.com/ericsciple) in [#2305](actions/checkout#2305)

**Full Changelog**: <actions/checkout@v4...v4.3.1>


## [vv4.3.0](https://github.com/actions/checkout/releases/tag/v4.3.0)

##### What's Changed

- docs: update README.md by [@motss](https://github.com/motss) in [#1971](actions/checkout#1971)
- Add internal repos for checking out multiple repositories by [@mouismail](https://github.com/mouismail) in [#1977](actions/checkout#1977)
- Documentation update - add recommended permissions to Readme by [@benwells](https://github.com/benwells) in [#2043](actions/checkout#2043)
- Adjust positioning of user email note and permissions heading by [@joshmgross](https://github.com/joshmgross) in [#2044](actions/checkout#2044)
- Update README.md by [@nebuk89](https://github.com/nebuk89) in [#2194](actions/checkout#2194)
- Update CODEOWNERS for actions by [@TingluoHuang](https://github.com/TingluoHuang) in [#2224](actions/checkout#2224)
- Update package dependencies by [@salmanmkc](https://github.com/salmanmkc) in [#2236](actions/checkout#2236)
- Prepare release v4.3.0 by [@salmanmkc](https://github.com/salmanmkc) in [#2237](actions/checkout#2237)

##### New Contributors

- [@motss](https://github.com/motss) made their first contribution in [#1971](actions/checkout#1971)
- [@mouismail](https://github.com/mouismail) made their first contribution in [#1977](actions/checkout#1977)
- [@benwells](https://github.com/benwells) made their first contribution in [#2043](actions/checkout#2043)
- [@nebuk89](https://github.com/nebuk89) made their first contribution in [#2194](actions/checkout#2194)
- [@salmanmkc](https://github.com/salmanmkc) made their first contribution in [#2236](actions/checkout#2236)

**Full Changelog**: <actions/checkout@v4...v4.3.0>


## [vv4.2.2](https://github.com/actions/checkout/blob/HEAD/CHANGELOG.md#v422)

- `url-helper.ts` now leverages well-known environment variables by [@jww3](https://github.com/jww3) in [#1941](actions/checkout#1941)
- Expand unit test coverage for `isGhes` by [@jww3](https://github.com/jww3) in [#1946](actions/checkout#1946)


## [vv4.2.1](https://github.com/actions/checkout/blob/HEAD/CHANGELOG.md#v421)

- Check out other refs/\* by commit if provided, fall back to ref by [@orhantoy](https://github.com/orhantoy) in [#1924](actions/checkout#1924)


## [vv4.2.0](https://github.com/actions/checkout/blob/HEAD/CHANGELOG.md#v420)

- Add Ref and Commit outputs by [@lucacome](https://github.com/lucacome) in [#1180](actions/checkout#1180)
- Dependency updates by [@dependabot-](https://github.com/dependabot-) [#1777](actions/checkout#1777), [#1872](actions/checkout#1872)
This was referenced Nov 20, 2025
Merged
Merged
Merged
Merged
Merged
Merged
Open
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TingluoHuang TingluoHuang TingluoHuang approved these changes

+1 more reviewer

@CosmicJesterX CosmicJesterX CosmicJesterX left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ericsciple @TingluoHuang @CosmicJesterX