Skip to content

Commit 4f6e954

Browse files
authored
Merge branch 'shadowsocks:master' into master
2 parents 2f66572 + 68b7ed3 commit 4f6e954

File tree

26 files changed

+132
-184
lines changed

26 files changed

+132
-184
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2.1
22

33
orbs:
4-
windows: circleci/windows@2.4.0
4+
windows: circleci/windows@5.0.0
55

66
jobs:
77
build-linux:
@@ -186,7 +186,7 @@ jobs:
186186

187187
publish-github-releases:
188188
docker:
189-
- image: circleci/golang:1.12
189+
- image: circleci/golang:1.17
190190
steps:
191191
- attach_workspace:
192192
at: /tmp/workspace

.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ updates:
33
- package-ecosystem: cargo
44
directory: "/"
55
schedule:
6-
interval: daily
7-
open-pull-requests-limit: 50
6+
interval: weekly
7+
open-pull-requests-limit: 0

.github/workflows/build-docker-image.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ jobs:
1616
- name: Checkout
1717
uses: actions/checkout@v4
1818
- name: Setup Docker Buildx
19-
uses: docker/setup-buildx-action@v2
19+
uses: docker/setup-buildx-action@v3
2020
- name: Login to GitHub Container Registry
21-
uses: docker/login-action@v2
21+
uses: docker/login-action@v3
2222
with:
2323
registry: ghcr.io
2424
username: ${{ github.repository_owner }}
2525
password: ${{ secrets.GITHUB_TOKEN }}
2626
- name: Docker metadata
2727
id: metadata
28-
uses: docker/metadata-action@v4
28+
uses: docker/metadata-action@v5
2929
with:
3030
images: ghcr.io/${{ github.repository_owner }}/${{ matrix.bin }}-rust
3131
- name: Build and release Docker images
32-
uses: docker/build-push-action@v3
32+
uses: docker/build-push-action@v6
3333
with:
3434
platforms: linux/386,linux/amd64,linux/arm64/v8
3535
target: ${{ matrix.bin }}

.github/workflows/build-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
./build-release -t ${{ matrix.target }} $compile_features $compile_compress
7272
7373
- name: Upload Github Assets
74-
uses: softprops/action-gh-release@v1
74+
uses: softprops/action-gh-release@v2
7575
env:
7676
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7777
with:
@@ -116,7 +116,7 @@ jobs:
116116
./build/build-host-release -t ${{ matrix.target }}
117117
118118
- name: Upload Github Assets
119-
uses: softprops/action-gh-release@v1
119+
uses: softprops/action-gh-release@v2
120120
env:
121121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
122122
with:
@@ -145,7 +145,7 @@ jobs:
145145
pwsh ./build/build-host-release.ps1 "full winservice"
146146
147147
- name: Upload Github Assets
148-
uses: softprops/action-gh-release@v1
148+
uses: softprops/action-gh-release@v2
149149
env:
150150
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
151151
with:

0 commit comments

Comments
 (0)