Skip to content

Commit f86a4de

Browse files
ibigbugxrayrgoonkia678OPPO9008
authored
Merge upstream (#24)
* xray-core v25.3.6 and other updates (XrayR-project#748) * Update docker.yml * Update actions/upload-artifact: v3 to v4 (XrayR-project#742) https://github.blog/changelog/2024-04-16-deprecation-notice-v3-of-the-artifact-actions/ * up * up * up * lint * Update app/mydispatcher/sniffer.go --------- Co-authored-by: xrayrgoon <[email protected]> Co-authored-by: kia678 <[email protected]> Co-authored-by: OPPO9008 <[email protected]>
1 parent fe2d09e commit f86a4de

File tree

13 files changed

+318
-421
lines changed

13 files changed

+318
-421
lines changed

.github/workflows/golangci-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ jobs:
2020
with:
2121
go-version: stable
2222
- name: golangci-lint
23-
uses: golangci/golangci-lint-action@v6
23+
uses: golangci/golangci-lint-action@v8
2424
with:
25-
version: v1.62.2
25+
version: v2.1.0

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ jobs:
176176
run: |
177177
mv build_assets XrayR-$ASSET_NAME
178178
- name: Upload files to Artifacts
179-
uses: actions/upload-artifact@v3
179+
uses: actions/upload-artifact@v4
180180
with:
181181
name: XrayR-${{ steps.get_filename.outputs.ASSET_NAME }}
182182
path: |

0 commit comments

Comments
 (0)