diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index fc8decf..f961a19 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -10,43 +10,46 @@ jobs:
test-cover-integration:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- uses: actions/setup-go@v3
with:
go-version-file: 'go.mod'
- name: Build and test with integration coverage
run: |
go build -cover -v
- mkdir -p coverage/integration
- GOCOVERDIR="$(pwd)/coverage/integration" go test ./... -v -count=1
- - uses: actions/upload-artifact@v3
+ mkdir -p coverage
+ GOCOVERDIR="$(pwd)/coverage" go test ./... -v -count=1
+ - uses: actions/upload-artifact@v4
with:
+ name: coverage-integration
path: coverage
test-cover-build:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- uses: actions/setup-go@v3
with:
go-version-file: 'go.mod'
- name: Build and test with unit coverage
run: |
go build -v
- mkdir -p coverage/unit
- go test ./... -v -count=1 -cover -args -test.gocoverdir="$PWD/coverage/unit"
- - uses: actions/upload-artifact@v3
+ mkdir -p coverage
+ go test ./... -v -count=1 -cover -args -test.gocoverdir="$PWD/coverage"
+ - uses: actions/upload-artifact@v4
with:
+ name: coverage-unit
path: coverage
coverage:
runs-on: ubuntu-latest
needs: [test-cover-integration, test-cover-build]
steps:
- - uses: actions/checkout@v3
- - uses: actions/download-artifact@v3
+ - uses: actions/checkout@v4
+ - uses: actions/download-artifact@v4
- name: Process coverage
run: |
- go tool covdata textfmt -i=./artifact/unit,./artifact/integration -o=coverage.txt
+ go tool covdata textfmt -i=./coverage-integration,./coverage-unit -o=coverage.txt
- name: Upload coverage reports to Codecov
- uses: codecov/codecov-action@v3
+ uses: codecov/codecov-action@v4
with:
file: ./coverage.txt
+ token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index 26e7998..d850d17 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -16,7 +16,7 @@ jobs:
os: [linux]
arch: [amd64, arm64]
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- uses: actions/setup-go@v3
with:
go-version-file: 'go.mod'
diff --git a/.github/workflows/release-verify-deb-ubuntu.yml b/.github/workflows/release-verify-deb-ubuntu.yml
index 9f664ff..45d7a8f 100644
--- a/.github/workflows/release-verify-deb-ubuntu.yml
+++ b/.github/workflows/release-verify-deb-ubuntu.yml
@@ -12,7 +12,7 @@ jobs:
verify:
runs-on: ubuntu-latest
steps:
- - uses: actions/download-artifact@v3
+ - uses: actions/download-artifact@v4
with:
name: artifact
- run: |
diff --git a/.github/workflows/release-verify-rpm-rhel.yml b/.github/workflows/release-verify-rpm-rhel.yml
index b22fad1..58dc333 100644
--- a/.github/workflows/release-verify-rpm-rhel.yml
+++ b/.github/workflows/release-verify-rpm-rhel.yml
@@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
container: redhat/ubi8-minimal:latest
steps:
- - uses: actions/download-artifact@v3
+ - uses: actions/download-artifact@v4
with:
name: artifact
- run: |
diff --git a/go.mod b/go.mod
index 24d44ce..68bdd7d 100644
--- a/go.mod
+++ b/go.mod
@@ -3,24 +3,23 @@ module github.com/dirk/quickhook
go 1.21
require (
- github.com/alecthomas/kong v0.8.1
+ github.com/alecthomas/kong v0.9.0
github.com/creack/pty v1.1.21
github.com/fatih/color v1.16.0
github.com/samber/lo v1.39.0
- github.com/stretchr/testify v1.8.4
+ github.com/stretchr/testify v1.9.0
)
require (
- github.com/alecthomas/assert/v2 v2.5.0 // indirect
- github.com/alecthomas/repr v0.3.0 // indirect
+ github.com/alecthomas/assert/v2 v2.7.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
- golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 // indirect
- golang.org/x/sys v0.17.0 // indirect
+ golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
+ golang.org/x/sys v0.18.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/go.sum b/go.sum
index 89bfd41..1ecb7c8 100644
--- a/go.sum
+++ b/go.sum
@@ -1,9 +1,9 @@
-github.com/alecthomas/assert/v2 v2.5.0 h1:OJKYg53BQx06/bMRBSPDCO49CbCDNiUQXwdoNrt6x5w=
-github.com/alecthomas/assert/v2 v2.5.0/go.mod h1:fw5suVxB+wfYJ3291t0hRTqtGzFYdSwstnRQdaQx2DM=
-github.com/alecthomas/kong v0.8.1 h1:acZdn3m4lLRobeh3Zi2S2EpnXTd1mOL6U7xVml+vfkY=
-github.com/alecthomas/kong v0.8.1/go.mod h1:n1iCIO2xS46oE8ZfYCNDqdR0b0wZNrXAIAqro/2132U=
-github.com/alecthomas/repr v0.3.0 h1:NeYzUPfjjlqHY4KtzgKJiWd6sVq2eNUPTi34PiFGjY8=
-github.com/alecthomas/repr v0.3.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
+github.com/alecthomas/assert/v2 v2.7.0 h1:QtqSACNS3tF7oasA8CU6A6sXZSBDqnm7RfpLl9bZqbE=
+github.com/alecthomas/assert/v2 v2.7.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
+github.com/alecthomas/kong v0.9.0 h1:G5diXxc85KvoV2f0ZRVuMsi45IrBgx9zDNGNj165aPA=
+github.com/alecthomas/kong v0.9.0/go.mod h1:Y47y5gKfHp1hDc7CH7OeXgLIpp+Q2m1Ni0L5s3bI8Os=
+github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
+github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/creack/pty v1.1.21 h1:1/QdRyBaHHJP61QkWMXlOIBfsgdDeeKfK8SYVUWJKf0=
github.com/creack/pty v1.1.21/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
@@ -33,14 +33,14 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 h1:/RIbNt/Zr7rVhIkQhooTxCxFcdWLGIKnZA4IXNFSrvo=
-golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 h1:aAcj0Da7eBAtrTp03QXWvm88pSyOt+UgdZw2BFZ+lEw=
+golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
diff --git a/hooks/pre_commit_git_shim.sh b/hooks/pre_commit_git_shim.sh
index 4009531..7a9e71d 100644
--- a/hooks/pre_commit_git_shim.sh
+++ b/hooks/pre_commit_git_shim.sh
@@ -13,7 +13,7 @@ if
then
# The Git executable below will be replaced at runtime when shimming.
ACTUAL_GIT "$COMMAND" "$@"
- exit 0
+ exit $?
fi
COMBINED=$(echo "$COMMAND $*" | xargs)
echo "git is not allowed in parallel hooks (git $COMBINED)"
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy