Skip to content

Commit b7b5063

Browse files
authored
Merge pull request #4 from golangci/main
golangci-lint-action@v7
2 parents c2b197a + dec74fa commit b7b5063

File tree

23 files changed

+19222
-1735
lines changed

23 files changed

+19222
-1735
lines changed

.github/workflows/codeql.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ name: "Code Scanning - Action"
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- main
67
pull_request:
78
# The branches below must be a subset of the branches above
8-
branches: [ master ]
9+
branches:
10+
- main
911
schedule:
1012
- cron: '0 17 * * 5'
1113

.github/workflows/test.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
name: "build-and-test"
22
on: # rebuild any PRs and main branch changes
33
pull_request:
4+
branches:
5+
- main
46
push:
57
branches:
6-
- master
7-
- "releases/*"
8+
- main
89

910
jobs:
1011
build: # make sure build/ci work properly
@@ -47,13 +48,14 @@ jobs:
4748
matrix:
4849
os:
4950
- ubuntu-latest
51+
- ubuntu-22.04-arm
5052
- macos-latest
5153
- windows-latest
5254
version:
5355
- ""
5456
- "latest"
55-
- "v1.60"
56-
- "v1.60.1"
57+
- "v2.0"
58+
- "v2.0.0"
5759
runs-on: ${{ matrix.os }}
5860
permissions:
5961
contents: read
@@ -75,13 +77,14 @@ jobs:
7577
matrix:
7678
os:
7779
- ubuntu-latest
80+
- ubuntu-22.04-arm
7881
- macos-latest
7982
- windows-latest
8083
version:
8184
- ""
8285
- "latest"
83-
- "v1.60.1"
84-
- "adbdfdb288e939a175182b7a12b7555215ce98b2"
86+
- "v2.0.0"
87+
- "1f032fbc4b117e4247b19ff606cc847ab5383bc9"
8588
runs-on: ${{ matrix.os }}
8689
permissions:
8790
contents: read
@@ -98,14 +101,18 @@ jobs:
98101
only-new-issues: true
99102
install-mode: goinstall
100103

101-
test-go-mod-version:
104+
test-go-mod:
102105
needs: [ build ]
103106
strategy:
104107
matrix:
105108
os:
106109
- ubuntu-latest
110+
- ubuntu-22.04-arm
107111
- macos-latest
108112
- windows-latest
113+
wd:
114+
- sample-go-mod
115+
- sample-go-tool
109116
runs-on: ${{ matrix.os }}
110117
permissions:
111118
contents: read
@@ -116,5 +123,5 @@ jobs:
116123
go-version: oldstable
117124
- uses: ./
118125
with:
119-
working-directory: sample-go-mod
126+
working-directory: ${{ matrix.wd }}
120127
args: --timeout=5m --issues-exit-code=0 ./...

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ __tests__/runner/*
66
node_modules/
77
lib/
88

9-
# Rest pulled from https://github.com/github/gitignore/blob/master/Node.gitignore
9+
# Rest pulled from https://github.com/github/gitignore/blob/HEAD/Node.gitignore
1010
# Logs
1111
logs
1212
*.log

.golangci.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: "2"
2+
3+
output:
4+
show-stats: true
5+
sort-order:
6+
- file
7+
- linter

.github/CONTRIBUTING.md renamed to CONTRIBUTING.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,21 @@
2323

2424
* Ensure the PR description clearly describes the problem and solution.
2525
Include the relevant issue number if applicable.
26+
27+
## Development of this action
28+
29+
1. Install [act](https://github.com/nektos/act#installation)
30+
2. Make a symlink for `act` to work properly: `ln -s . golangci-lint-action`
31+
3. Install dependencies: `npm install`
32+
4. Build: `npm run build`
33+
5. Run `npm run local` after any change to test it
34+
35+
### Releases
36+
37+
```bash
38+
npm version <major | minor | patch> -m "Upgrade to %s"
39+
```
40+
41+
- https://docs.npmjs.com/cli/v11/commands/npm-version
42+
43+
The "major tag" (ex: `v6`) should be deleted and then recreated manually.

0 commit comments

Comments
 (0)