fix(ci): address review feedback
- commit
- 0f5f939378bfaef92c46d6dcb57a7e5bce2db6dc
- author
- brice · · 2026-06-11 04:18 UTC
- parent
- 1ec93bf
- signature
- GPG Verified
CD88F9E564E0102646FB6077A1A07C7C7C3E349D· arch-gpg Verified for the committer email
2 files · +4 -4
M .github/workflows/ci.yml +3 -3
| @@ -68,7 +68,9 @@ jobs: | |||
| 68 | 68 | - name: Verify generated systemviews artifacts | |
| 69 | 69 | run: make verify-generated | |
| 70 | 70 | - name: Install golangci-lint | |
| 71 | - | run: make install-golangci-lint TOOL_BIN_DIR=/usr/local/bin | |
| 71 | + | run: | | |
| 72 | + | make install-golangci-lint | |
| 73 | + | echo "$(go env GOPATH)/bin" >> "$GITHUB_PATH" | |
| 72 | 74 | - name: Run golangci-lint | |
| 73 | 75 | run: | | |
| 74 | 76 | git config --global --add safe.directory "$GITHUB_WORKSPACE" | |
| @@ -102,8 +104,6 @@ jobs: | |||
| 102 | 104 | ${{ runner.os }}-go-build- | |
| 103 | 105 | - name: Build application and systemviews assets | |
| 104 | 106 | run: make build | |
| 105 | - | - name: Verify generated systemviews artifacts | |
| 106 | - | run: make verify-generated | |
| 107 | 107 | - name: Run tests | |
| 108 | 108 | env: | |
| 109 | 109 | GDK_BACKEND: wayland | |
| @@ -68,7 +68,9 @@ jobs: | |||||
| 68 | - name: Verify generated systemviews artifacts | 68 | - name: Verify generated systemviews artifacts | ||
| 69 | run: make verify-generated | 69 | run: make verify-generated | ||
| 70 | - name: Install golangci-lint | 70 | - name: Install golangci-lint | ||
| 71 | - | run: make install-golangci-lint TOOL_BIN_DIR=/usr/local/bin | 71 | + | run: | |
| 72 | + | make install-golangci-lint | |||
| 73 | + | echo "$(go env GOPATH)/bin" >> "$GITHUB_PATH" | |||
| 72 | - name: Run golangci-lint | 74 | - name: Run golangci-lint | ||
| 73 | run: | | 75 | run: | | ||
| 74 | git config --global --add safe.directory "$GITHUB_WORKSPACE" | 76 | git config --global --add safe.directory "$GITHUB_WORKSPACE" | ||
| @@ -102,8 +104,6 @@ jobs: | |||||
| 102 | ${{ runner.os }}-go-build- | 104 | ${{ runner.os }}-go-build- | ||
| 103 | - name: Build application and systemviews assets | 105 | - name: Build application and systemviews assets | ||
| 104 | run: make build | 106 | run: make build | ||
| 105 | - | - name: Verify generated systemviews artifacts | |||
| 106 | - | run: make verify-generated | |||
| 107 | - name: Run tests | 107 | - name: Run tests | ||
| 108 | env: | 108 | env: | ||
| 109 | GDK_BACKEND: wayland | 109 | GDK_BACKEND: wayland | ||
M Makefile +1 -1
| @@ -158,7 +158,7 @@ fmt: ## Format Go code with gofmt | |||
| 158 | 158 | install-golangci-lint: ## Install pinned golangci-lint | |
| 159 | 159 | @echo "Installing golangci-lint $(GOLANGCI_LINT_VERSION) to $(TOOL_BIN_DIR)..." | |
| 160 | 160 | @mkdir -p $(TOOL_BIN_DIR) | |
| 161 | - | curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/$(GOLANGCI_LINT_VERSION)/install.sh | sh -s -- -b $(TOOL_BIN_DIR) $(GOLANGCI_LINT_VERSION) | |
| 161 | + | curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TOOL_BIN_DIR) $(GOLANGCI_LINT_VERSION) | |
| 162 | 162 | ||
| 163 | 163 | install-staticcheck: ## Install pinned Staticcheck with the active Go toolchain | |
| 164 | 164 | @echo "Installing staticcheck $(STATICCHECK_VERSION)..." | |
| @@ -158,7 +158,7 @@ fmt: ## Format Go code with gofmt | |||||
| 158 | install-golangci-lint: ## Install pinned golangci-lint | 158 | install-golangci-lint: ## Install pinned golangci-lint | ||
| 159 | @echo "Installing golangci-lint $(GOLANGCI_LINT_VERSION) to $(TOOL_BIN_DIR)..." | 159 | @echo "Installing golangci-lint $(GOLANGCI_LINT_VERSION) to $(TOOL_BIN_DIR)..." | ||
| 160 | @mkdir -p $(TOOL_BIN_DIR) | 160 | @mkdir -p $(TOOL_BIN_DIR) | ||
| 161 | - | curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/$(GOLANGCI_LINT_VERSION)/install.sh | sh -s -- -b $(TOOL_BIN_DIR) $(GOLANGCI_LINT_VERSION) | 161 | + | curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TOOL_BIN_DIR) $(GOLANGCI_LINT_VERSION) |
| 162 | 162 | ||||
| 163 | install-staticcheck: ## Install pinned Staticcheck with the active Go toolchain | 163 | install-staticcheck: ## Install pinned Staticcheck with the active Go toolchain | ||
| 164 | @echo "Installing staticcheck $(STATICCHECK_VERSION)..." | 164 | @echo "Installing staticcheck $(STATICCHECK_VERSION)..." | ||