Skip to content

Commit

Permalink
Merge branch 'shadowsocks:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
arloor authored Oct 16, 2024
2 parents 2f66572 + 68b7ed3 commit 4f6e954
Show file tree
Hide file tree
Showing 26 changed files with 132 additions and 184 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1

orbs:
windows: circleci/windows@2.4.0
windows: circleci/windows@5.0.0

jobs:
build-linux:
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:

publish-github-releases:
docker:
- image: circleci/golang:1.12
- image: circleci/golang:1.17
steps:
- attach_workspace:
at: /tmp/workspace
Expand Down
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ updates:
- package-ecosystem: cargo
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 50
interval: weekly
open-pull-requests-limit: 0
8 changes: 4 additions & 4 deletions .github/workflows/build-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Docker metadata
id: metadata
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ghcr.io/${{ github.repository_owner }}/${{ matrix.bin }}-rust
- name: Build and release Docker images
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
platforms: linux/386,linux/amd64,linux/arm64/v8
target: ${{ matrix.bin }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
./build-release -t ${{ matrix.target }} $compile_features $compile_compress
- name: Upload Github Assets
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
./build/build-host-release -t ${{ matrix.target }}
- name: Upload Github Assets
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
pwsh ./build/build-host-release.ps1 "full winservice"
- name: Upload Github Assets
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
Loading

0 comments on commit 4f6e954

Please sign in to comment.