From 1a814120757cd929c604a9d9f742d2c8f1adbc86 Mon Sep 17 00:00:00 2001 From: Christian Rebischke Date: Sun, 15 Dec 2024 13:46:05 +0000 Subject: [PATCH 1/3] Pin test-suite to fix failing CI runs The newest test-suite have new npm tests that were not yet implemented in packageurl-go. We will have to add the missing implementation first. This commit attempts to unblock all CI runs and unblock development. --- .github/workflows/test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 97c2b9e..a6448e0 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -15,7 +15,8 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - name: Download test data - run: curl -L https://raw.githubusercontent.com/package-url/purl-spec/master/test-suite-data.json -o testdata/test-suite-data.json + # TODO(@shibumi): Remove pinned version and reset to master, once the failing npm test-cases got fixed. + run: curl -L https://raw.githubusercontent.com/package-url/purl-spec/0dd92f26f8bb11956ffdf5e8acfcee71e8560407/test-suite-data.json -o testdata/test-suite-data.json - name: Test go fmt run: test -z $(go fmt ./...) - name: Golangci-lint From a0f67c0c9b267187cbbf88bf578ce3095a30b4a0 Mon Sep 17 00:00:00 2001 From: Christian Rebischke Date: Sun, 15 Dec 2024 13:48:14 +0000 Subject: [PATCH 2/3] Remove deprecated linter settings Certain linters got deprecated in newer golangci-lint versions. We have to remove those linters from the list to avoid a blocking linter. --- .golangci.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.golangci.yaml b/.golangci.yaml index 73a5741..a34f282 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -5,13 +5,10 @@ linters-settings: linters: disable-all: true enable: - - deadcode - errcheck - gosimple - govet - ineffassign - staticcheck - - structcheck - typecheck - - unused - - varcheck \ No newline at end of file + - unused \ No newline at end of file From d16b3878ec95a719ed0e33f9db8cbce34ea2eb50 Mon Sep 17 00:00:00 2001 From: Christian Rebischke Date: Sun, 15 Dec 2024 13:49:41 +0000 Subject: [PATCH 3/3] Update CI tool versions This commit updates several versions in our CI file. --- .github/workflows/test.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a6448e0..21f14e6 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -4,23 +4,23 @@ jobs: test: strategy: matrix: - go-version: [1.21.x, 1.22.x] + go-version: [1.22.x, 1.23.x] os: [ubuntu-latest] runs-on: ${{ matrix.os }} steps: - name: Install Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Download test data # TODO(@shibumi): Remove pinned version and reset to master, once the failing npm test-cases got fixed. run: curl -L https://raw.githubusercontent.com/package-url/purl-spec/0dd92f26f8bb11956ffdf5e8acfcee71e8560407/test-suite-data.json -o testdata/test-suite-data.json - name: Test go fmt run: test -z $(go fmt ./...) - name: Golangci-lint - uses: golangci/golangci-lint-action@v2 + uses: golangci/golangci-lint-action@v6 with: only-new-issues: true - name: Test coverage