Skip to content

Commit 1437509

Browse files
authored
Merge pull request #2638 from fatedier/dev
bump version to v0.38.0
2 parents 997d406 + 71489d1 commit 1437509

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+294
-226
lines changed

.circleci/config.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@ version: 2
22
jobs:
33
go-version-latest:
44
docker:
5-
- image: circleci/golang:1.16-node
6-
working_directory: /go/src/github.com/fatedier/frp
5+
- image: cimg/go:1.17-node
76
steps:
87
- checkout
98
- run: make
109
- run: make alltest
1110
go-version-last:
1211
docker:
13-
- image: circleci/golang:1.15-node
14-
working_directory: /go/src/github.com/fatedier/frp
12+
- image: cimg/go:1.16-node
1513
steps:
1614
- checkout
1715
- run: make

.github/FUNDING.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# These are supported funding model platforms
2+
3+
github: [fatedier]

.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 0 additions & 44 deletions
This file was deleted.
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
name: Bug report
2+
description: Report a bug to help us improve frp
3+
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Thanks for taking the time to fill out this bug report!
9+
- type: textarea
10+
id: bug-description
11+
attributes:
12+
label: Bug Description
13+
description: Tell us what issues you ran into
14+
placeholder: Include information about what you tried, what you expected to happen, and what actually happened. The more details, the better!
15+
validations:
16+
required: true
17+
- type: input
18+
id: frpc-version
19+
attributes:
20+
label: frpc Version
21+
description: Include the output of `frpc -v`
22+
validations:
23+
required: true
24+
- type: input
25+
id: frps-version
26+
attributes:
27+
label: frps Version
28+
description: Include the output of `frps -v`
29+
validations:
30+
required: true
31+
- type: input
32+
id: system-architecture
33+
attributes:
34+
label: System Architecture
35+
description: Include which architecture you used, such as `linux/amd64`, `windows/amd64`
36+
validations:
37+
required: true
38+
- type: textarea
39+
id: config
40+
attributes:
41+
label: Configurations
42+
description: Include what configurrations you used and ran into this problem
43+
placeholder: Pay attention to hiding the token and password in your output
44+
validations:
45+
required: true
46+
- type: textarea
47+
id: log
48+
attributes:
49+
label: Logs
50+
description: Prefer you providing releated error logs here
51+
placeholder: Pay attention to hiding your personal informations
52+
- type: textarea
53+
id: steps-to-reproduce
54+
attributes:
55+
label: Steps to reproduce
56+
description: How to reproduce it? It's important for us to find the bug
57+
value: |
58+
1.
59+
2.
60+
3.
61+
...
62+
- type: checkboxes
63+
id: area
64+
attributes:
65+
label: Affected area
66+
options:
67+
- label: "Docs"
68+
- label: "Installation"
69+
- label: "Performance and Scalability"
70+
- label: "Security"
71+
- label: "User Experience"
72+
- label: "Test and Release"
73+
- label: "Developer Infrastructure"
74+
- label: "Client Plugin"
75+
- label: "Server Plugin"
76+
- label: "Extensions"
77+
- label: "Others"

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
11
blank_issues_enabled: false
2-
contact_links:
3-
- name: DOCS
4-
url: https://github.com/fatedier/frp
5-
about: Here you can find out how to configure frp.

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Feature Request
2+
description: Suggest an idea to improve frp
3+
title: "[Feature Request] "
4+
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
This is only used to request new product features.
10+
- type: textarea
11+
id: feature-request
12+
attributes:
13+
label: Describe the feature request
14+
description: Tell us what's you want and why it should be added in frp.
15+
validations:
16+
required: true
17+
- type: textarea
18+
id: alternatives
19+
attributes:
20+
label: Describe alternatives you've considered
21+
- type: checkboxes
22+
id: area
23+
attributes:
24+
label: Affected area
25+
options:
26+
- label: "Docs"
27+
- label: "Installation"
28+
- label: "Performance and Scalability"
29+
- label: "Security"
30+
- label: "User Experience"
31+
- label: "Test and Release"
32+
- label: "Developer Infrastructure"
33+
- label: "Client Plugin"
34+
- label: "Server Plugin"
35+
- label: "Extensions"
36+
- label: "Others"

.github/workflows/build-and-push-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Go 1.x
1818
uses: actions/setup-go@v2
1919
with:
20-
go-version: 1.16
20+
go-version: 1.17
2121

2222
- run: |
2323
# https://github.com/actions/setup-go/issues/107

.github/workflows/goreleaser.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Go
1616
uses: actions/setup-go@v2
1717
with:
18-
go-version: 1.16
18+
go-version: 1.17
1919

2020
- run: |
2121
# https://github.com/actions/setup-go/issues/107

.github/workflows/stale.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
- uses: actions/stale@v3
1616
with:
1717
repo-token: ${{ secrets.GITHUB_TOKEN }}
18-
stale-issue-message: 'Issues go stale after 45d of inactivity. Stale issues rot after an additional 10d of inactivity and eventually close.'
19-
stale-pr-message: 'Issues go stale after 45d of inactivity. Stale issues rot after an additional 10d of inactivity and eventually close.'
18+
stale-issue-message: 'Issues go stale after 30d of inactivity. Stale issues rot after an additional 7d of inactivity and eventually close.'
19+
stale-pr-message: 'Issues go stale after 30d of inactivity. Stale issues rot after an additional 7d of inactivity and eventually close.'
2020
stale-issue-label: 'lifecycle/stale'
2121
exempt-issue-labels: 'bug,doc,enhancement,future,proposal,question,testing,todo,easy,help wanted,assigned'
2222
stale-pr-label: 'lifecycle/stale'
2323
exempt-pr-labels: 'bug,doc,enhancement,future,proposal,question,testing,todo,easy,help wanted,assigned'
24-
days-before-stale: 45
25-
days-before-close: 10
24+
days-before-stale: 30
25+
days-before-close: 7
2626
debug-only: ${{ github.event.inputs.debug-only }}

0 commit comments

Comments
 (0)