From 054d0cb10e52c6a7594135d64bf9671530671cd6 Mon Sep 17 00:00:00 2001 From: Alessio Perugini Date: Mon, 27 Jan 2025 15:57:30 +0100 Subject: [PATCH] 5.13.0 --- .github/workflows/test-go-task.yml | 87 +++++++++++++++--------------- go.mod | 2 +- go.sum | 3 ++ 3 files changed, 47 insertions(+), 45 deletions(-) diff --git a/.github/workflows/test-go-task.yml b/.github/workflows/test-go-task.yml index f3a30a82a5f..5f767864a9d 100644 --- a/.github/workflows/test-go-task.yml +++ b/.github/workflows/test-go-task.yml @@ -72,7 +72,7 @@ jobs: id: collection # jq flags must be "-cRn" see: https://stackoverflow.com/a/68859958/1655275 run: | - echo "tests-data=$(go list ./internal/integrationtest/... | grep integrationtest/ | tr "/" " " | cut -d " " -f 6 | grep lib | jq -cRn '[inputs]')" >> $GITHUB_OUTPUT + echo "tests-data=$(go list ./internal/integrationtest/... | grep integrationtest/ | tr "/" " " | cut -d " " -f 6 | jq -cRn '[inputs]')" >> $GITHUB_OUTPUT test-integration: needs: tests-collector @@ -121,53 +121,52 @@ jobs: path: | ./coverage_integration_*.txt - test: - needs: run-determination - strategy: - fail-fast: false - matrix: - operating-system: - - windows-latest - - macos-latest - - ubuntu-latest - - runs-on: ${{ matrix.operating-system }} - - steps: - # By default, actions/checkout converts the repo's LF line endings to CRLF on the Windows runner. - - name: Disable EOL conversions - run: git config --global core.autocrlf false - - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Install Go - uses: actions/setup-go@v5 - with: - go-version: ${{ env.GO_VERSION }} - - - name: Install Task - uses: arduino/setup-task@v2 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - version: 3.x - - - name: Run tests - run: task go:test - - - name: Upload coverage data to workflow artifact - if: runner.os == 'Linux' - uses: actions/upload-artifact@v4 - with: - if-no-files-found: error - name: ${{ env.COVERAGE_ARTIFACT }}-test-${{ matrix.operating-system }} - path: | - ./coverage_unit.txt + # test: + # needs: run-determination + # strategy: + # fail-fast: false + # matrix: + # operating-system: + # - windows-latest + # - macos-latest + # - ubuntu-latest + # + # runs-on: ${{ matrix.operating-system }} + # + # steps: + # # By default, actions/checkout converts the repo's LF line endings to CRLF on the Windows runner. + # - name: Disable EOL conversions + # run: git config --global core.autocrlf false + # + # - name: Checkout repository + # uses: actions/checkout@v4 + # + # - name: Install Go + # uses: actions/setup-go@v5 + # with: + # go-version: ${{ env.GO_VERSION }} + # + # - name: Install Task + # uses: arduino/setup-task@v2 + # with: + # repo-token: ${{ secrets.GITHUB_TOKEN }} + # version: 3.x + # + # - name: Run tests + # run: task go:test + # + # - name: Upload coverage data to workflow artifact + # if: runner.os == 'Linux' + # uses: actions/upload-artifact@v4 + # with: + # if-no-files-found: error + # name: ${{ env.COVERAGE_ARTIFACT }}-test-${{ matrix.operating-system }} + # path: | + # ./coverage_unit.txt coverage-upload: runs-on: ubuntu-latest needs: - - test - test-integration steps: - name: Checkout repository diff --git a/go.mod b/go.mod index 9e341a98dbd..af83c836723 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/djherbis/buffer v1.2.0 github.com/djherbis/nio/v3 v3.0.1 github.com/fatih/color v1.18.0 - github.com/go-git/go-git/v5 v5.13.1 + github.com/go-git/go-git/v5 v5.13.0 github.com/gofrs/uuid/v5 v5.3.0 github.com/leonelquinteros/gotext v1.7.0 github.com/mailru/easyjson v0.7.7 diff --git a/go.sum b/go.sum index d27cdece17e..dbe38219f9a 100644 --- a/go.sum +++ b/go.sum @@ -49,6 +49,7 @@ github.com/djherbis/buffer v1.2.0 h1:PH5Dd2ss0C7CRRhQCZ2u7MssF+No9ide8Ye71nPHcrQ github.com/djherbis/buffer v1.2.0/go.mod h1:fjnebbZjCUpPinBRD+TDwXSOeNQ7fPQWLfGQqiAiUyE= github.com/djherbis/nio/v3 v3.0.1 h1:6wxhnuppteMa6RHA4L81Dq7ThkZH8SwnDzXDYy95vB4= github.com/djherbis/nio/v3 v3.0.1/go.mod h1:Ng4h80pbZFMla1yKzm61cF0tqqilXZYrogmWgZxOcmg= +github.com/elazarl/goproxy v1.2.1 h1:njjgvO6cRG9rIqN2ebkqy6cQz2Njkx7Fsfv/zIZqgug= github.com/elazarl/goproxy v1.2.3 h1:xwIyKHbaP5yfT6O9KIeYJR5549MXRQkoQMRXGztz8YQ= github.com/elazarl/goproxy v1.4.0 h1:4GyuSbFa+s26+3rmYNSuUVsx+HgPrV1bk1jXI0l9wjM= github.com/elazarl/goproxy v1.4.0/go.mod h1:X/5W/t+gzDyLfHW4DrMdpjqYjpXsURlBt9lpBDxZZZQ= @@ -68,6 +69,8 @@ github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UN github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= +github.com/go-git/go-git/v5 v5.13.0 h1:vLn5wlGIh/X78El6r3Jr+30W16Blk0CTcxTYcYPWi5E= +github.com/go-git/go-git/v5 v5.13.0/go.mod h1:Wjo7/JyVKtQgUNdXYXIepzWfJQkUEIGvkvVkiXRR/zw= github.com/go-git/go-git/v5 v5.13.1 h1:DAQ9APonnlvSWpvolXWIuV6Q6zXy2wHbN4cVlNR5Q+M= github.com/go-git/go-git/v5 v5.13.1/go.mod h1:qryJB4cSBoq3FRoBRf5A77joojuBcmPJ0qu3XXXVixc= github.com/go-git/go-git/v5 v5.13.2 h1:7O7xvsK7K+rZPKW6AQR1YyNhfywkv7B8/FsP3ki6Zv0=