[build test]1.18

This commit is contained in:
gVisor bot 2022-03-16 17:54:44 +08:00
parent 01d7a43793
commit a57355aae3
5 changed files with 9 additions and 5 deletions

View File

@ -8,7 +8,7 @@ jobs:
- name: Get latest go version - name: Get latest go version
id: version id: version
run: | run: |
echo ::set-output name=go_version::$(curl -s https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json | grep -oE '"version": "[0-9]{1}.[0-9]{1,}(.[0-9]{1,})?"' | head -1 | cut -d':' -f2 | sed 's/ //g; s/"//g') echo ::set-output name=go_version::$(curl -s https://raw.githubusercontent.com/actions/go-versions/update-versions-manifest-file/versions-manifest.json | grep -oE '"version": "[0-9]{1}.[0-9]{1,}(.[0-9]{1,})?"' | head -1 | cut -d':' -f2 | sed 's/ //g; s/"//g')
- name: Setup Go - name: Setup Go
uses: actions/setup-go@v2 uses: actions/setup-go@v2
with: with:

View File

@ -8,7 +8,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v1 uses: actions/setup-go@v1
with: with:
go-version: 1.17 go-version: 1.18
- name: Check out code - name: Check out code
uses: actions/checkout@v1 uses: actions/checkout@v1
- name: Build - name: Build

View File

@ -94,7 +94,9 @@ func parseRule(tp, payload string, params []string) (C.Rule, error) {
case "DST-PORT": case "DST-PORT":
parsed, parseErr = RC.NewPort(payload, "", false, nil) parsed, parseErr = RC.NewPort(payload, "", false, nil)
case "PROCESS-NAME": case "PROCESS-NAME":
parsed, parseErr = RC.NewProcess(payload, "", nil) parsed, parseErr = RC.NewProcess(payload, "", true, nil)
case "PROCESS-PATH":
parsed, parseErr = RC.NewProcess(payload, "", false, nil)
case "RULE-SET": case "RULE-SET":
parsed, parseErr = provider.NewRuleSet(payload, "", nil) parsed, parseErr = provider.NewRuleSet(payload, "", nil)
case "NOT": case "NOT":

View File

@ -81,7 +81,9 @@ func parseRule(tp, payload, target string, params []string) (C.Rule, error) {
case "DST-PORT": case "DST-PORT":
parsed, parseErr = RC.NewPort(payload, target, false, ruleExtra) parsed, parseErr = RC.NewPort(payload, target, false, ruleExtra)
case "PROCESS-NAME": case "PROCESS-NAME":
parsed, parseErr = RC.NewProcess(payload, target, ruleExtra) parsed, parseErr = RC.NewProcess(payload, target, true, ruleExtra)
case "PROCESS-PATH":
parsed, parseErr = RC.NewProcess(payload, target, false, ruleExtra)
case "GEOIP": case "GEOIP":
noResolve := RC.HasNoResolve(params) noResolve := RC.HasNoResolve(params)
parsed, parseErr = RC.NewGEOIP(payload, target, noResolve, ruleExtra) parsed, parseErr = RC.NewGEOIP(payload, target, noResolve, ruleExtra)

View File

@ -36,7 +36,7 @@ var (
// default timeout for UDP session // default timeout for UDP session
udpTimeout = 60 * time.Second udpTimeout = 60 * time.Second
preProcessCacheFinder, _ = R.NewProcess("", "", nil) preProcessCacheFinder, _ = R.NewProcess("", "", false, nil)
) )
func init() { func init() {