Merge pull request #620 from SergioChan/fix/issue-619-pr-target-checkout

davidnewhall · web-flow · commit 15dba7bb731d · 2026-03-12T16:54:20.000-07:00
ci: checkout PR head on pull_request_target runs
diff --git a/.github/workflows/codetests.yml b/.github/workflows/codetests.yml
@@ -12,7 +12,15 @@ jobs:
         os: [ubuntu, macos, windows]
     runs-on: ${{ matrix.os }}-latest
     steps:
-      - uses: actions/checkout@v6
+      - name: checkout PR head (pull_request_target)
+        if: github.event_name == 'pull_request_target'
+        uses: actions/checkout@v6
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: checkout branch (push)
+        if: github.event_name == 'push'
+        uses: actions/checkout@v6
       - uses: actions/setup-go@v6
         with:
           go-version: 'stable'
@@ -32,7 +40,15 @@ jobs:
     env:
       GOOS: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v6
+      - name: checkout PR head (pull_request_target)
+        if: github.event_name == 'pull_request_target'
+        uses: actions/checkout@v6
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: checkout branch (push)
+        if: github.event_name == 'push'
+        uses: actions/checkout@v6
       - uses: actions/setup-go@v6
         with:
           go-version: 'stable'
@@ -53,7 +69,15 @@ jobs:
     env:
       GOOS: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v6
+      - name: checkout PR head (pull_request_target)
+        if: github.event_name == 'pull_request_target'
+        uses: actions/checkout@v6
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.sha }}
+      - name: checkout branch (push)
+        if: github.event_name == 'push'
+        uses: actions/checkout@v6
       - uses: actions/setup-go@v6
         with:
           go-version: 'stable'
diff --git a/pkg/ui/dlgs.go b/pkg/ui/dlgs.go
@@ -27,21 +27,21 @@ func Warning(title, msg string) (bool, error) {
 }
 
 // Error wraps an error dialog.
-func Error(title, msg string, v ...any) (bool, error) {
+func Error(title, msg string, args ...any) (bool, error) {
 	if !HasGUI() {
 		return true, nil
 	}
 
-	return dialogResult(zenity.Error(fmt.Sprintf(msg, v...), zenity.Title(title)))
+	return dialogResult(zenity.Error(fmt.Sprintf(msg, args...), zenity.Title(title)))
 }
 
 // Info wraps an info dialog.
-func Info(title, msg string, v ...any) (bool, error) {
+func Info(title, msg string, args ...any) (bool, error) {
 	if !HasGUI() {
 		return true, nil
 	}
 
-	return dialogResult(zenity.Info(fmt.Sprintf(msg, v...), zenity.Title(title)))
+	return dialogResult(zenity.Info(fmt.Sprintf(msg, args...), zenity.Title(title)))
 }
 
 // Entry wraps a text-entry dialog.
@@ -54,12 +54,15 @@ func Entry(title, msg, val string) (string, bool, error) {
 	if errors.Is(err, zenity.ErrCanceled) {
 		return val, false, nil
 	}
+	if err != nil {
+		return entry, false, fmt.Errorf("zenity entry: %w", err)
+	}
 
-	return entry, err == nil, err
+	return entry, true, nil
 }
 
 // Question wraps a question dialog.
-func Question(title string, defaultCancel bool, text string, v ...any) (bool, error) {
+func Question(title string, defaultCancel bool, text string, args ...any) (bool, error) {
 	if !HasGUI() {
 		return true, nil
 	}
@@ -69,5 +72,5 @@ func Question(title string, defaultCancel bool, text string, v ...any) (bool, er
 		opts = append(opts, zenity.DefaultCancel())
 	}
 
-	return dialogResult(zenity.Question(fmt.Sprintf(text, v...), opts...))
+	return dialogResult(zenity.Question(fmt.Sprintf(text, args...), opts...))
 }

Original file line number	Diff line number	Diff line change
`@@ -27,21 +27,21 @@ func Warning(title, msg string) (bool, error) {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`// Error wraps an error dialog.`
`30`		`-func Error(title, msg string, v ...any) (bool, error) {`
	`30`	`+func Error(title, msg string, args ...any) (bool, error) {`
`31`	`31`	`if !HasGUI() {`
`32`	`32`	`return true, nil`
`33`	`33`	`}`
`34`	`34`
`35`		`- return dialogResult(zenity.Error(fmt.Sprintf(msg, v...), zenity.Title(title)))`
	`35`	`+ return dialogResult(zenity.Error(fmt.Sprintf(msg, args...), zenity.Title(title)))`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`// Info wraps an info dialog.`
`39`		`-func Info(title, msg string, v ...any) (bool, error) {`
	`39`	`+func Info(title, msg string, args ...any) (bool, error) {`
`40`	`40`	`if !HasGUI() {`
`41`	`41`	`return true, nil`
`42`	`42`	`}`
`43`	`43`
`44`		`- return dialogResult(zenity.Info(fmt.Sprintf(msg, v...), zenity.Title(title)))`
	`44`	`+ return dialogResult(zenity.Info(fmt.Sprintf(msg, args...), zenity.Title(title)))`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`// Entry wraps a text-entry dialog.`
`@@ -54,12 +54,15 @@ func Entry(title, msg, val string) (string, bool, error) {`
`54`	`54`	`if errors.Is(err, zenity.ErrCanceled) {`
`55`	`55`	`return val, false, nil`
`56`	`56`	`}`
	`57`	`+ if err != nil {`
	`58`	`+ return entry, false, fmt.Errorf("zenity entry: %w", err)`
	`59`	`+ }`
`57`	`60`
`58`		`- return entry, err == nil, err`
	`61`	`+ return entry, true, nil`
`59`	`62`	`}`
`60`	`63`
`61`	`64`	`// Question wraps a question dialog.`
`62`		`-func Question(title string, defaultCancel bool, text string, v ...any) (bool, error) {`
	`65`	`+func Question(title string, defaultCancel bool, text string, args ...any) (bool, error) {`
`63`	`66`	`if !HasGUI() {`
`64`	`67`	`return true, nil`
`65`	`68`	`}`
`@@ -69,5 +72,5 @@ func Question(title string, defaultCancel bool, text string, v ...any) (bool, er`
`69`	`72`	`opts = append(opts, zenity.DefaultCancel())`
`70`	`73`	`}`
`71`	`74`
`72`		`- return dialogResult(zenity.Question(fmt.Sprintf(text, v...), opts...))`
	`75`	`+ return dialogResult(zenity.Question(fmt.Sprintf(text, args...), opts...))`
`73`	`76`	`}`