From 69d851ec902cde1395190574b27d31c32015b5cc Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 12 Jun 2024 12:17:05 +0200 Subject: [PATCH 01/12] Change to create PR --- .github/workflows/golangci-lint.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 07b5e5e60..4998a70d5 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -22,3 +22,4 @@ jobs: with: version: latest only-new-issues: true + From 357053bb20b368df8a4ed241e60936de56fd9389 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 12 Jun 2024 12:29:27 +0200 Subject: [PATCH 02/12] Maybe fixed problem --- .github/workflows/golangci-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 4998a70d5..ce9dbba3d 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/setup-go@v4 with: - go-version: 1.21 + go-version: 1.22 - uses: actions/checkout@v3 - name: golangci-lint uses: golangci/golangci-lint-action@v3 From 8d73083fc3dbae4ed9a9fb12f0a9d63738f151a1 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 12 Jun 2024 12:31:33 +0200 Subject: [PATCH 03/12] Changed golangci action version and changed output format of golangci --- .github/workflows/golangci-lint.yml | 2 +- .golangci.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index ce9dbba3d..5b9f3a60a 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: { dir: ['./...', './worker', './worker/edge'] } steps: - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v6 with: go-version: 1.22 - uses: actions/checkout@v3 diff --git a/.golangci.yml b/.golangci.yml index 37693758f..54830d7f8 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -89,3 +89,7 @@ issues: - gosec - unparam - staticcheck + +output: + formats: + - format: colored-line-number \ No newline at end of file From f31fed1fb482c4a0585f89d636c8daf3210f9379 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 12 Jun 2024 12:33:01 +0200 Subject: [PATCH 04/12] Fixed error --- .github/workflows/golangci-lint.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 5b9f3a60a..fe9d9d020 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -13,12 +13,12 @@ jobs: strategy: matrix: { dir: ['./...', './worker', './worker/edge'] } steps: - - uses: actions/setup-go@v6 + - uses: actions/setup-go@v4 with: go-version: 1.22 - uses: actions/checkout@v3 - name: golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v6 with: version: latest only-new-issues: true From 9bed2788c501eb5275fe4f939ca0f0870262fc54 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 12 Jun 2024 12:38:07 +0200 Subject: [PATCH 05/12] Added npm install so golangci finds node_modules folder --- .github/workflows/golangci-lint.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index fe9d9d020..2799294f8 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -17,6 +17,8 @@ jobs: with: go-version: 1.22 - uses: actions/checkout@v3 + - uses: bahmutov/npm-install@v1 + - run: npm t - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: From 87db9a6eafdb5c3714aaace1db121c158c9bfe1e Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 12 Jun 2024 12:40:04 +0200 Subject: [PATCH 06/12] Another fix for the bug --- .github/workflows/golangci-lint.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 2799294f8..86632019d 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -17,8 +17,7 @@ jobs: with: go-version: 1.22 - uses: actions/checkout@v3 - - uses: bahmutov/npm-install@v1 - - run: npm t + - run: mkdir node_modules - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: From 8861ffe71fa3271d91098db81228532b06cd0ea5 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 12 Jun 2024 12:42:40 +0200 Subject: [PATCH 07/12] Fixed bug --- .github/workflows/golangci-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 86632019d..d79e513c5 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -16,8 +16,8 @@ jobs: - uses: actions/setup-go@v4 with: go-version: 1.22 - - uses: actions/checkout@v3 - run: mkdir node_modules + - uses: actions/checkout@v3 - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: From d0f7012e58bcccaccb5e4898e0ee73c009d42147 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 12 Jun 2024 12:44:22 +0200 Subject: [PATCH 08/12] Added npm installation --- .github/workflows/golangci-lint.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index d79e513c5..56f0d60e1 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -16,8 +16,10 @@ jobs: - uses: actions/setup-go@v4 with: go-version: 1.22 - - run: mkdir node_modules + - uses: actions/setup-node@v4 + node-version: "latest" - uses: actions/checkout@v3 + - run: npm ci - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: From 4783f22f476870623942cec958ddb0f3973a3d08 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 12 Jun 2024 12:45:23 +0200 Subject: [PATCH 09/12] Fixed bug --- .github/workflows/golangci-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 56f0d60e1..d85c65b3d 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-node@v4 node-version: "latest" - uses: actions/checkout@v3 - - run: npm ci + - run: npm ci web/ - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: From 01836d088c74d6f5053cd1c26b285ccb559fd5c8 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 12 Jun 2024 13:36:23 +0200 Subject: [PATCH 10/12] Trigger tests From d2d3bb871523ff0253e5293accaba1a7eee0ba7b Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 12 Jun 2024 13:36:58 +0200 Subject: [PATCH 11/12] Fixed bugs --- .github/workflows/golangci-lint.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index d85c65b3d..66205e3ce 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -17,7 +17,8 @@ jobs: with: go-version: 1.22 - uses: actions/setup-node@v4 - node-version: "latest" + with: + node-version: 14 - uses: actions/checkout@v3 - run: npm ci web/ - name: golangci-lint From 21bcaf9daf9c5dc7866c58eaab40285e5248e8c2 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Thu, 13 Jun 2024 14:04:07 +0200 Subject: [PATCH 12/12] Fixed a npm bug --- .github/workflows/golangci-lint.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 66205e3ce..68b1aeaad 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -16,11 +16,10 @@ jobs: - uses: actions/setup-go@v4 with: go-version: 1.22 - - uses: actions/setup-node@v4 - with: - node-version: 14 - uses: actions/checkout@v3 - - run: npm ci web/ + - name: Install modules + working-directory: ./web + run: npm ci - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: