From e8080f87c27ca01f434979f17908907a95350098 Mon Sep 17 00:00:00 2001 From: Jo Date: Mon, 19 Feb 2024 17:04:06 +0100 Subject: [PATCH] chore(yay): fix breaking -git ci test (#2373) * chore(yay): fix breaking test * chore(yay): fix breaking test * chore(yay): fix breaking test * update gomod * remove debug commands --- .github/workflows/builder-image.yml | 2 +- .github/workflows/multiarch-build.yml | 6 ++++-- .github/workflows/testing-git.yml | 5 +++-- .github/workflows/testing.yml | 2 +- go.mod | 6 +++--- go.sum | 12 ++++++------ pkg/runtime/pacman_test.go | 8 +++++++- pkg/runtime/runtime_test.go | 8 +++++++- 8 files changed, 32 insertions(+), 17 deletions(-) diff --git a/.github/workflows/builder-image.yml b/.github/workflows/builder-image.yml index fc2d2dbb1..170b8b025 100644 --- a/.github/workflows/builder-image.yml +++ b/.github/workflows/builder-image.yml @@ -23,7 +23,7 @@ jobs: - linux/arm64 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Docker meta id: meta uses: docker/metadata-action@v4 diff --git a/.github/workflows/multiarch-build.yml b/.github/workflows/multiarch-build.yml index de91468a5..95905735c 100644 --- a/.github/workflows/multiarch-build.yml +++ b/.github/workflows/multiarch-build.yml @@ -14,7 +14,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Set up QEMU uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx @@ -53,7 +55,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Read info diff --git a/.github/workflows/testing-git.yml b/.github/workflows/testing-git.yml index 8650469c8..7c4242335 100644 --- a/.github/workflows/testing-git.yml +++ b/.github/workflows/testing-git.yml @@ -14,7 +14,7 @@ jobs: container: image: jguer/yay-builder:latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/cache@v3 with: path: ~/go/pkg/mod @@ -35,4 +35,5 @@ jobs: chmod -R 777 pacman-git su github -c 'cd pacman-git; yes | makepkg -i --nocheck' - name: Run Build and Tests with pacman-git - run: make test + run: | + make test diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 002352d26..2a7c858d4 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -9,7 +9,7 @@ jobs: container: image: jguer/yay-builder:latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/cache@v3 with: path: ~/go/pkg/mod diff --git a/go.mod b/go.mod index 5f1349d12..c1b437687 100644 --- a/go.mod +++ b/go.mod @@ -9,8 +9,8 @@ require ( github.com/bradleyjkemp/cupaloy v2.3.0+incompatible github.com/leonelquinteros/gotext v1.5.2 github.com/stretchr/testify v1.8.4 - golang.org/x/sys v0.16.0 - golang.org/x/term v0.16.0 + golang.org/x/sys v0.17.0 + golang.org/x/term v0.17.0 golang.org/x/text v0.14.0 // indirect gopkg.in/h2non/gock.v1 v1.1.2 ) @@ -28,7 +28,7 @@ require ( github.com/deckarep/golang-set/v2 v2.6.0 github.com/itchyny/gojq v0.12.14 // indirect github.com/itchyny/timefmt-go v0.1.5 // indirect - github.com/ohler55/ojg v1.21.0 // indirect + github.com/ohler55/ojg v1.21.2 // indirect ) require github.com/hashicorp/go-multierror v1.1.1 diff --git a/go.sum b/go.sum index 06614316e..50a251f5e 100644 --- a/go.sum +++ b/go.sum @@ -36,8 +36,8 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= -github.com/ohler55/ojg v1.21.0 h1:niqSS6yl3PQZJrqh7pKs/zinl4HebGe8urXEfpvlpYY= -github.com/ohler55/ojg v1.21.0/go.mod h1:gQhDVpQLqrmnd2eqGAvJtn+NfKoYJbe/A4Sj3/Vro4o= +github.com/ohler55/ojg v1.21.2 h1:6N3eBqzMQ4lYurweV/H/c3DK0Z2ufj8aZcAj3mhknwM= +github.com/ohler55/ojg v1.21.2/go.mod h1:gQhDVpQLqrmnd2eqGAvJtn+NfKoYJbe/A4Sj3/Vro4o= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -67,12 +67,12 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +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/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= -golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= diff --git a/pkg/runtime/pacman_test.go b/pkg/runtime/pacman_test.go index dd0b96ee0..23f7fbc0b 100644 --- a/pkg/runtime/pacman_test.go +++ b/pkg/runtime/pacman_test.go @@ -4,16 +4,22 @@ package runtime import ( + "path/filepath" "testing" "github.com/Morganamilo/go-pacmanconf" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "github.com/Jguer/yay/v12/pkg/settings/parser" ) func TestPacmanConf(t *testing.T) { t.Parallel() + path := "../../testdata/pacman.conf" + + absPath, err := filepath.Abs(path) + require.NoError(t, err) expectedPacmanConf := &pacmanconf.Config{ RootDir: "/", DBPath: "/var/lib/pacman/", @@ -45,7 +51,7 @@ func TestPacmanConf(t *testing.T) { }, } - pacmanConf, color, err := retrievePacmanConfig(parser.MakeArguments(), "../../testdata/pacman.conf") + pacmanConf, color, err := retrievePacmanConfig(parser.MakeArguments(), absPath) assert.Nil(t, err) assert.NotNil(t, pacmanConf) assert.Equal(t, color, false) diff --git a/pkg/runtime/runtime_test.go b/pkg/runtime/runtime_test.go index e83ce16a2..75b88d1e0 100644 --- a/pkg/runtime/runtime_test.go +++ b/pkg/runtime/runtime_test.go @@ -4,6 +4,7 @@ package runtime_test import ( + "path/filepath" "testing" "github.com/stretchr/testify/assert" @@ -16,6 +17,11 @@ import ( func TestBuildRuntime(t *testing.T) { t.Parallel() + path := "../../testdata/pacman.conf" + + absPath, err := filepath.Abs(path) + require.NoError(t, err) + // Prepare test inputs cfg := &settings.Configuration{ Debug: true, @@ -24,7 +30,7 @@ func TestBuildRuntime(t *testing.T) { AURRPCURL: "https://aur.archlinux.org/rpc", BuildDir: "/tmp", VCSFilePath: "", - PacmanConf: "../../testdata/pacman.conf", + PacmanConf: absPath, } cmdArgs := parser.MakeArguments() version := "1.0.0"