Skip to content

Commit 4981f5a

Browse files
authored
Merge pull request #51 from grafana/50-add-k6-archive-support
50 add k6 archive support
2 parents 896a950 + c047d6e commit 4981f5a

33 files changed

+933
-135
lines changed

.github/workflows/lint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
- name: Setup go
2323
uses: actions/setup-go@v5
2424
with:
25-
go-version: "1.22.4"
25+
go-version: "1.23.x"
2626
cache: false
2727
- name: Go linter
2828
uses: golangci/golangci-lint-action@v6
2929
with:
30-
version: v1.57
30+
version: v1.63.4
3131
args: --timeout=30m
3232
install-mode: binary

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
- name: Set up Go
1818
uses: actions/setup-go@v5
1919
with:
20-
go-version: "1.22.4"
20+
go-version: "1.23.x"
2121
- name: Run GoReleaser
2222
uses: goreleaser/goreleaser-action@v6
2323
with:
2424
distribution: goreleaser
25-
version: "2.0.1"
25+
version: "2.4.7"
2626
args: release --clean
2727
env:
2828
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Install Go
2828
uses: actions/setup-go@v5
2929
with:
30-
go-version: "1.22.4"
30+
go-version: "1.23.x"
3131
- name: Checkout code
3232
uses: actions/checkout@v4
3333

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
/package.json
66
/yarn.lock
77
test*.db
8+
/coverage.txt

.golangci.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# v1.57.2
1+
# v1.62.2
22
# Please don't remove the first line. It uses in CI to determine the golangci version
33
run:
44
timeout: 5m
@@ -19,25 +19,27 @@ issues:
1919
# files (due to common repeats and long functions in test code)
2020
- path: _(test|gen)\.go
2121
linters:
22+
- canonicalheader
2223
- cyclop
2324
- dupl
2425
- gocognit
2526
- funlen
2627
- lll
2728
- forcetypeassert
29+
- path: js\/modules\/k6\/browser\/.*\.go
30+
linters:
31+
- revive
32+
- contextcheck
2833
- path: js\/modules\/k6\/html\/.*\.go
2934
text: "exported: exported "
3035
linters:
3136
- revive
3237
- path: js\/modules\/k6\/http\/.*_test\.go
3338
linters:
3439
# k6/http module's tests are quite complex because they often have several nested levels.
35-
# The module is in maintainance mode, so we don't intend to port the tests to a parallel version.
40+
# The module is in maintenance mode, so we don't intend to port the tests to a parallel version.
3641
- paralleltest
3742
- tparallel
38-
- linters:
39-
- staticcheck # Tracked in https://github.com/grafana/xk6-grpc/issues/14
40-
text: "The entire proto file grpc/reflection/v1alpha/reflection.proto is marked as deprecated."
4143
- linters:
4244
- forbidigo
4345
text: 'use of `os\.(SyscallError|Signal|Interrupt)` forbidden'
@@ -71,6 +73,7 @@ linters:
7173
- asciicheck
7274
- bidichk
7375
- bodyclose
76+
- canonicalheader
7477
- contextcheck
7578
- cyclop
7679
- dogsled
@@ -82,6 +85,7 @@ linters:
8285
- errorlint
8386
- exhaustive
8487
- exportloopref
88+
- fatcontext
8589
- forbidigo
8690
- forcetypeassert
8791
- funlen

.goreleaser.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ checksum:
2727
name_template: "{{ .ProjectName }}_{{ .Version }}_checksums.txt"
2828

2929
snapshot:
30-
name_template: "{{ incpatch .Version }}-next+{{.ShortCommit}}{{if .IsGitDirty}}.dirty{{else}}{{end}}"
30+
version_template: "{{ incpatch .Version }}-next+{{.ShortCommit}}{{if .IsGitDirty}}.dirty{{else}}{{end}}"
3131

3232
changelog:
3333
sort: asc

CODE_OF_CONDUCT.md

+133
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
2+
# Contributor Covenant Code of Conduct
3+
4+
## Our Pledge
5+
6+
We as members, contributors, and leaders pledge to make participation in our
7+
community a harassment-free experience for everyone, regardless of age, body
8+
size, visible or invisible disability, ethnicity, sex characteristics, gender
9+
identity and expression, level of experience, education, socio-economic status,
10+
nationality, personal appearance, race, caste, color, religion, or sexual
11+
identity and orientation.
12+
13+
We pledge to act and interact in ways that contribute to an open, welcoming,
14+
diverse, inclusive, and healthy community.
15+
16+
## Our Standards
17+
18+
Examples of behavior that contributes to a positive environment for our
19+
community include:
20+
21+
* Demonstrating empathy and kindness toward other people
22+
* Being respectful of differing opinions, viewpoints, and experiences
23+
* Giving and gracefully accepting constructive feedback
24+
* Accepting responsibility and apologizing to those affected by our mistakes,
25+
and learning from the experience
26+
* Focusing on what is best not just for us as individuals, but for the overall
27+
community
28+
29+
Examples of unacceptable behavior include:
30+
31+
* The use of sexualized language or imagery, and sexual attention or advances of
32+
any kind
33+
* Trolling, insulting or derogatory comments, and personal or political attacks
34+
* Public or private harassment
35+
* Publishing others' private information, such as a physical or email address,
36+
without their explicit permission
37+
* Other conduct which could reasonably be considered inappropriate in a
38+
professional setting
39+
40+
## Enforcement Responsibilities
41+
42+
Community leaders are responsible for clarifying and enforcing our standards of
43+
acceptable behavior and will take appropriate and fair corrective action in
44+
response to any behavior that they deem inappropriate, threatening, offensive,
45+
or harmful.
46+
47+
Community leaders have the right and responsibility to remove, edit, or reject
48+
comments, commits, code, wiki edits, issues, and other contributions that are
49+
not aligned to this Code of Conduct, and will communicate reasons for moderation
50+
decisions when appropriate.
51+
52+
## Scope
53+
54+
This Code of Conduct applies within all community spaces, and also applies when
55+
an individual is officially representing the community in public spaces.
56+
Examples of representing our community include using an official e-mail address,
57+
posting via an official social media account, or acting as an appointed
58+
representative at an online or offline event.
59+
60+
## Enforcement
61+
62+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
63+
reported to the community leaders responsible for enforcement at
64+
[INSERT CONTACT METHOD].
65+
All complaints will be reviewed and investigated promptly and fairly.
66+
67+
All community leaders are obligated to respect the privacy and security of the
68+
reporter of any incident.
69+
70+
## Enforcement Guidelines
71+
72+
Community leaders will follow these Community Impact Guidelines in determining
73+
the consequences for any action they deem in violation of this Code of Conduct:
74+
75+
### 1. Correction
76+
77+
**Community Impact**: Use of inappropriate language or other behavior deemed
78+
unprofessional or unwelcome in the community.
79+
80+
**Consequence**: A private, written warning from community leaders, providing
81+
clarity around the nature of the violation and an explanation of why the
82+
behavior was inappropriate. A public apology may be requested.
83+
84+
### 2. Warning
85+
86+
**Community Impact**: A violation through a single incident or series of
87+
actions.
88+
89+
**Consequence**: A warning with consequences for continued behavior. No
90+
interaction with the people involved, including unsolicited interaction with
91+
those enforcing the Code of Conduct, for a specified period of time. This
92+
includes avoiding interactions in community spaces as well as external channels
93+
like social media. Violating these terms may lead to a temporary or permanent
94+
ban.
95+
96+
### 3. Temporary Ban
97+
98+
**Community Impact**: A serious violation of community standards, including
99+
sustained inappropriate behavior.
100+
101+
**Consequence**: A temporary ban from any sort of interaction or public
102+
communication with the community for a specified period of time. No public or
103+
private interaction with the people involved, including unsolicited interaction
104+
with those enforcing the Code of Conduct, is allowed during this period.
105+
Violating these terms may lead to a permanent ban.
106+
107+
### 4. Permanent Ban
108+
109+
**Community Impact**: Demonstrating a pattern of violation of community
110+
standards, including sustained inappropriate behavior, harassment of an
111+
individual, or aggression toward or disparagement of classes of individuals.
112+
113+
**Consequence**: A permanent ban from any sort of public interaction within the
114+
community.
115+
116+
## Attribution
117+
118+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
119+
version 2.1, available at
120+
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
121+
122+
Community Impact Guidelines were inspired by
123+
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
124+
125+
For answers to common questions about this code of conduct, see the FAQ at
126+
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
127+
[https://www.contributor-covenant.org/translations][translations].
128+
129+
[homepage]: https://www.contributor-covenant.org
130+
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
131+
[Mozilla CoC]: https://github.com/mozilla/diversity
132+
[FAQ]: https://www.contributor-covenant.org/faq
133+
[translations]: https://www.contributor-covenant.org/translations

0 commit comments

Comments
 (0)