fix: Use git reset --hard instead of pull and checkout for actions #1156

Merged

mfenniak merged 4 commits from mfenniak/forgejo-runner:fix-git-update-cleanup into main 2025-11-17 03:29:05 +00:00

Conversation 4 Commits 4 Files changed 1 +3 -62

mfenniak commented 2025-11-14 20:40:31 +00:00

Owner

Copy link

Primary credit to @drewcassidy for 99% of the work in #1096: Attempt to fix #1071

The error in question was happening in the git fetch step due to the working tree having updates (finding what is modifying the working tree is a puzzle for another day). This is fixed by passing Force=true to the fetch command (I am unclear on what this means. vanilla git fetch doesnt care about the working tree at all)

Fixing this, it still failed due to the working tree. The current code is doing something silly with a pull and checkout, but a hard reset is probably the most robust solution.

• bug fixes
  • PR: fix: Use git reset --hard instead of pull and checkout for actions

Primary credit to @drewcassidy for 99% of the work in #1096: Attempt to fix #1071 The error in question was happening in the git fetch step due to the working tree having updates (finding what is modifying the working tree is a puzzle for another day). This is fixed by passing Force=true to the fetch command (I am unclear on what this means. vanilla `git fetch` doesnt care about the working tree at all) Fixing this, it still failed due to the working tree. The current code is doing something silly with a pull and checkout, but a hard reset is probably the most robust solution. <!--start release-notes-assistant--> <!--URL:https://code.forgejo.org/forgejo/runner--> - bug fixes - [PR](https://code.forgejo.org/forgejo/runner/pulls/1156): <!--number 1156 --><!--line 0 --><!--description Zml4OiBVc2UgZ2l0IHJlc2V0IC0taGFyZCBpbnN0ZWFkIG9mIHB1bGwgYW5kIGNoZWNrb3V0IGZvciBhY3Rpb25z-->fix: Use git reset --hard instead of pull and checkout for actions<!--description--> <!--end release-notes-assistant-->

mfenniak added 3 commits 2025-11-14 20:40:31 +00:00

Use git reset --hard instead of pull and checkout ... 9b4b32061b

Also use force fetch whatever that means

fix indents 1b6d6ed3d7

only log about cloning if clone was actually run f81d8f567b

mfenniak added the

run-end-to-end-tests

label 2025-11-14 20:50:01 +00:00

cascading-pr referenced this pull request from actions/setup-forgejo 2025-11-14 20:50:17 +00:00

cascading-pr from https://code.forgejo.org/forgejo/runner refs/pull/1156/head to forgejo/runner-1156 #760

cascading-pr commented 2025-11-14 20:50:18 +00:00

Contributor

Copy link

cascading-pr updated at actions/setup-forgejo#760

cascading-pr updated at https://code.forgejo.org/actions/setup-forgejo/pulls/760

mfenniak force-pushed fix-git-update-cleanup from fae08049ad to fe9a61a03a 2025-11-14 21:16:16 +00:00 Compare

cascading-pr commented 2025-11-14 21:27:17 +00:00

Contributor

Copy link

cascading-pr updated at actions/setup-forgejo#760

cascading-pr updated at https://code.forgejo.org/actions/setup-forgejo/pulls/760

mfenniak changed title from WIP: fix: Use git reset --hard instead of pull and checkout for actions to fix: Use git reset --hard instead of pull and checkout for actions 2025-11-14 22:40:07 +00:00

mfenniak commented 2025-11-15 01:52:21 +00:00

Author

Owner

Copy link

@drewcassidy If it'd be possible for you to review this incremental change to your PR, I'd appreciate the additional eyes on it.

@drewcassidy If it'd be possible for you to review this incremental change to your PR, I'd appreciate the additional eyes on it.

drewcassidy approved these changes 2025-11-17 02:59:07 +00:00

mfenniak merged commit 621ac7ed72 into main 2025-11-17 03:29:05 +00:00

mfenniak deleted branch fix-git-update-cleanup 2025-11-17 03:29:06 +00:00

mfenniak referenced this pull request from a commit 2025-11-17 03:29:07 +00:00

fix: Use git reset --hard instead of pull and checkout for actions (#1156)

mfenniak referenced this pull request 2025-11-19 19:58:56 +00:00

bug: action fetches can fail too easily #1091

mfenniak added the

Kind/Bug

label 2025-11-21 16:09:26 +00:00

mfenniak referenced this pull request 2025-11-21 18:09:29 +00:00

bug: action fetches can fail too easily #1091

forgejo-mirror referenced this pull request from a commit 2025-11-23 15:01:30 +00:00

Update module code.forgejo.org/forgejo/runner/v11 to v12 (forgejo) (#10213)

viceice-bot referenced this pull request 2025-11-28 05:31:32 +00:00

Update forgejo-runner to v12 (major) #1191

mfenniak referenced this pull request from a commit 2025-11-28 14:21:02 +00:00

Update forgejo-runner to v12 (major) (#1191)

viceice-bot referenced this pull request from actions/setup-forgejo 2025-12-27 15:07:34 +00:00

Update dependency forgejo/runner to v12 #800

Sign in to join this conversation.

Reviewers

No reviewers

drewcassidy

Labels

Clear labels   

FreeBSD

  

Kind/Breaking

Breaking change that won't be backward compatible

  

Kind/Bug

Something is not working

  

Kind/Chore

It is no fun but it needs to be done, this is a chore.

  

Kind/DependencyUpdate

for pull requests that are created by renovate when updating a dependency

  

Kind/Documentation

Documentation changes

  

Kind/Enhancement

Improve existing functionality

  

Kind/Feature

New functionality

  

Kind/Security

This is security issue

  

Kind/Testing

Issue or pull request related to testing

  

Priority

Critical

The priority is critical

  

Priority

High

The priority is high

  

Priority

Low

The priority is low

  

Priority

Medium

The priority is medium

  

Reviewed

Confirmed

Issue has been confirmed

  

Reviewed

Duplicate

This issue or pull request already exists

  

Reviewed

Invalid

Invalid issue

  

Reviewed

Won't Fix

This issue won't be fixed

  

Status

Abandoned

Somebody has started to work on this but abandoned work

  

Status

Blocked

Something is blocking this issue or pull request

  

Status

Need More Info

Feedback is required to reproduce issue or to continue work

  

Windows

Windows ports is an independent project, see https://github.com/Crown0815/Forgejo-runner-windows-builder

  

linux-powerpc64le

powerpc64le

  

linux-riscv64

  

linux-s390x

  

run-end-to-end-tests

Run https://code.forgejo.org/forgejo/end-to-end with a runner compiled from this pull request

  

run-forgejo-tests

Run https://codeberg.org/forgejo/forgejo tests importing the runner from this pull request

No labels

FreeBSD

Kind/Breaking

Kind/Bug

Kind/Chore

Kind/DependencyUpdate

Kind/Documentation

Kind/Enhancement

Kind/Feature

Kind/Security

Kind/Testing

Priority

Critical

Priority

High

Priority

Low

Priority

Medium

Reviewed

Confirmed

Reviewed

Duplicate

Reviewed

Invalid

Reviewed

Won't Fix

Status

Abandoned

Status

Blocked

Status

Need More Info

Windows

linux-powerpc64le

linux-riscv64

linux-s390x

run-end-to-end-tests

run-forgejo-tests

Milestone

Clear milestone

No items

No milestone

Assignees

Clear assignees

No assignees

3 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

forgejo/runner!1156

No description provided.