aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaulo Gomes <pjbgf@linux.com>2023-03-06 10:26:33 +0000
committerGitHub <noreply@github.com>2023-03-06 10:26:33 +0000
commit6a70cebb3da9916673a763c0beb716580faa4ff5 (patch)
tree62c6f8a69e1a78b685e319b0d8ada07fefae2181
parent7e345bb5e163a4badefb0c54da3a057dcde50ed6 (diff)
parenteddd209ed525a7814ffc80fc2bcd05eb31d0c23a (diff)
downloadgo-git-6a70cebb3da9916673a763c0beb716580faa4ff5.tar.gz
Merge pull request #701 from pjbgf/build
ci: Bump GitHub actions, enable go test race detection and stop using developer's GPG keys during test execution
-rw-r--r--.github/workflows/git.yml4
-rw-r--r--.github/workflows/test.yml4
-rw-r--r--Makefile2
-rw-r--r--worktree_test.go2
4 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/git.yml b/.github/workflows/git.yml
index f3dbe47..c945e72 100644
--- a/.github/workflows/git.yml
+++ b/.github/workflows/git.yml
@@ -17,12 +17,12 @@ jobs:
steps:
- name: Install Go
- uses: actions/setup-go@v1
+ uses: actions/setup-go@v3
with:
go-version: 1.20.x
- name: Checkout code
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Install build dependencies
run: sudo apt-get install gettext
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a7b614b..ce5872d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,12 +14,12 @@ jobs:
runs-on: ${{ matrix.platform }}
steps:
- name: Install Go
- uses: actions/setup-go@v1
+ uses: actions/setup-go@v3
with:
go-version: ${{ matrix.go-version }}
- name: Checkout code
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
- name: Configure known hosts
if: matrix.platform != 'ubuntu-latest'
diff --git a/Makefile b/Makefile
index d10922f..2acb8bc 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ build-git:
test:
@echo "running against `git version`"; \
- $(GOTEST) ./...
+ $(GOTEST) -race ./...
test-coverage:
@echo "running against `git version`"; \
diff --git a/worktree_test.go b/worktree_test.go
index b57a77d..ac56a46 100644
--- a/worktree_test.go
+++ b/worktree_test.go
@@ -259,7 +259,7 @@ func (s *RepositorySuite) TestPullAdd(c *C) {
ExecuteOnPath(c, path,
"touch foo",
"git add foo",
- "git commit -m foo foo",
+ "git commit --no-gpg-sign -m foo foo",
)
w, err := r.Worktree()