From 335873e1d860c579d918a8730268967b76f93ea2 Mon Sep 17 00:00:00 2001
From: Jason Song <i@wolfogre.com>
Date: Tue, 10 Jan 2023 10:37:20 +0800
Subject: [PATCH] chore: remove exp

---
 go.mod                    | 1 -
 go.sum                    | 2 --
 models/actions/run.go     | 3 +--
 models/actions/run_job.go | 3 +--
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/go.mod b/go.mod
index ac176e9341..a6f23b191c 100644
--- a/go.mod
+++ b/go.mod
@@ -99,7 +99,6 @@ require (
 	go.jolheiser.com/hcaptcha v0.0.4
 	go.jolheiser.com/pwn v0.0.3
 	golang.org/x/crypto v0.2.1-0.20221112162523-6fad3dfc1891
-	golang.org/x/exp v0.0.0-20221114191408-850992195362
 	golang.org/x/net v0.2.0
 	golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1
 	golang.org/x/sys v0.2.0
diff --git a/go.sum b/go.sum
index 8147f93438..7331fdf436 100644
--- a/go.sum
+++ b/go.sum
@@ -1642,8 +1642,6 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
 golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
-golang.org/x/exp v0.0.0-20221114191408-850992195362 h1:NoHlPRbyl1VFI6FjwHtPQCN7wAMXI6cKcqrmXhOOfBQ=
-golang.org/x/exp v0.0.0-20221114191408-850992195362/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
diff --git a/models/actions/run.go b/models/actions/run.go
index cda600b766..565a2a4bf1 100644
--- a/models/actions/run.go
+++ b/models/actions/run.go
@@ -18,7 +18,6 @@ import (
 	webhook_module "code.gitea.io/gitea/modules/webhook"
 
 	"github.com/nektos/act/pkg/jobparser"
-	"golang.org/x/exp/slices"
 	"xorm.io/builder"
 )
 
@@ -230,7 +229,7 @@ func UpdateRun(ctx context.Context, run *ActionRun, cols ...string) error {
 	}
 	_, err := sess.Update(run)
 
-	if run.Status != 0 || slices.Contains(cols, "status") {
+	if run.Status != 0 || util.IsStringInSlice("status", cols) {
 		if run.RepoID == 0 {
 			run, err = GetRunByID(ctx, run.ID)
 			if err != nil {
diff --git a/models/actions/run_job.go b/models/actions/run_job.go
index 32c43bc563..edaf445931 100644
--- a/models/actions/run_job.go
+++ b/models/actions/run_job.go
@@ -12,7 +12,6 @@ import (
 	"code.gitea.io/gitea/modules/timeutil"
 	"code.gitea.io/gitea/modules/util"
 
-	"golang.org/x/exp/slices"
 	"xorm.io/builder"
 )
 
@@ -108,7 +107,7 @@ func UpdateRunJob(ctx context.Context, job *ActionRunJob, cond builder.Cond, col
 		return 0, err
 	}
 
-	if affected == 0 || (!slices.Contains(cols, "status") && job.Status == 0) {
+	if affected == 0 || (!util.IsStringInSlice("status", cols) && job.Status == 0) {
 		return affected, nil
 	}