Skip to content

Commit

Permalink
chore: aggresive upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
hero-intelligent committed Feb 5, 2024
1 parent a1f62c2 commit c21f54f
Show file tree
Hide file tree
Showing 13 changed files with 1,709 additions and 1,172 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '16.x'
cache: 'npm'
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout codebase
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Prepare
Expand All @@ -37,18 +37,18 @@ jobs:
echo "IMAGE=daeuniverse/dae" >> $GITHUB_OUTPUT
echo "TAG=$tag" >> $GITHUB_OUTPUT
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build production image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
builder: ${{ steps.buildx.outputs.name }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate-changelogs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
permissions:
issues: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Generate release changelogs
uses: daeuniverse/changelogs-generator-action@main
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/kernel-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11

- name: Set up Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
with:
go-version: 1.21.0

Expand All @@ -28,7 +28,7 @@ jobs:
make GOFLAGS="-buildvcs=false" CC=clang
- name: Store executable
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
with:
name: dae
path: dae
Expand All @@ -46,13 +46,13 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11

- name: Retrieve stored executable
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: dae
path: dae

- name: Provision LVH VMs
uses: cilium/little-vm-helper@908ab1ff8a596a03cd5221a1f8602dc44c3f906d # v0.0.12
uses: cilium/little-vm-helper@9d758b756305e83718a51b792a5aeabd022a39ec # v0.0.16
with:
test-name: dae-test
image-version: ${{ matrix.kernel }}
Expand All @@ -66,7 +66,7 @@ jobs:
apt install -y unzip
- name: Setup network
uses: cilium/little-vm-helper@908ab1ff8a596a03cd5221a1f8602dc44c3f906d # v0.0.12
uses: cilium/little-vm-helper@9d758b756305e83718a51b792a5aeabd022a39ec # v0.0.16
with:
provision: 'false'
cmd: |
Expand All @@ -77,7 +77,7 @@ jobs:
docker run -td --name dae --privileged --network dae -v /host:/host -v /sys:/sys ubuntu:22.04 bash
- name: Setup v2ray server
uses: cilium/little-vm-helper@908ab1ff8a596a03cd5221a1f8602dc44c3f906d # v0.0.12
uses: cilium/little-vm-helper@9d758b756305e83718a51b792a5aeabd022a39ec # v0.0.16
with:
provision: 'false'
cmd: |
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
echo '{"v":"2","ps":"test","add":"v2ray","port":"23333","id":"b004539e-0d7b-7996-c378-fb040e42de70","aid":"0","net":"tcp","tls":"","type":"none","path":"","host":"v2ray"}' > vmess.json
- name: Setup dae server
uses: cilium/little-vm-helper@908ab1ff8a596a03cd5221a1f8602dc44c3f906d # v0.0.12
uses: cilium/little-vm-helper@9d758b756305e83718a51b792a5aeabd022a39ec # v0.0.16
with:
provision: 'false'
cmd: |
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
cat dae.log
- name: Check WAN IPv4 TCP
uses: cilium/little-vm-helper@908ab1ff8a596a03cd5221a1f8602dc44c3f906d # v0.0.12
uses: cilium/little-vm-helper@9d758b756305e83718a51b792a5aeabd022a39ec # v0.0.16
with:
provision: 'false'
cmd: |
Expand All @@ -180,7 +180,7 @@ jobs:
cat /host/v2ray.access.log | grep -q 'accepted tcp:1.1.1.1:443'
- name: Check WAN IPv4 UDP
uses: cilium/little-vm-helper@908ab1ff8a596a03cd5221a1f8602dc44c3f906d # v0.0.12
uses: cilium/little-vm-helper@9d758b756305e83718a51b792a5aeabd022a39ec # v0.0.16
with:
provision: 'false'
cmd: |
Expand All @@ -191,7 +191,7 @@ jobs:
cat /host/v2ray.access.log | grep -q 'accepted udp:1.1.1.1:53'
- name: Check WAN IPv6 TCP
uses: cilium/little-vm-helper@908ab1ff8a596a03cd5221a1f8602dc44c3f906d # v0.0.12
uses: cilium/little-vm-helper@9d758b756305e83718a51b792a5aeabd022a39ec # v0.0.16
with:
provision: 'false'
cmd: |
Expand All @@ -202,7 +202,7 @@ jobs:
cat /host/dae.log | grep -F -- '-> [2606:4700:4700::1111]:443'
- name: Check WAN IPv6 UDP
uses: cilium/little-vm-helper@908ab1ff8a596a03cd5221a1f8602dc44c3f906d # v0.0.12
uses: cilium/little-vm-helper@9d758b756305e83718a51b792a5aeabd022a39ec # v0.0.16
with:
provision: 'false'
cmd: |
Expand All @@ -212,7 +212,7 @@ jobs:
cat /host/dae.log | grep -F -- '-> [2606:4700:4700::1111]:53'
- name: Setup LAN
uses: cilium/little-vm-helper@908ab1ff8a596a03cd5221a1f8602dc44c3f906d # v0.0.12
uses: cilium/little-vm-helper@9d758b756305e83718a51b792a5aeabd022a39ec # v0.0.16
with:
provision: 'false'
cmd: |
Expand Down Expand Up @@ -288,7 +288,7 @@ jobs:
cat dae.log
- name: Check LAN IPv4 TCP
uses: cilium/little-vm-helper@908ab1ff8a596a03cd5221a1f8602dc44c3f906d # v0.0.12
uses: cilium/little-vm-helper@9d758b756305e83718a51b792a5aeabd022a39ec # v0.0.16
with:
provision: 'false'
cmd: |
Expand All @@ -299,7 +299,7 @@ jobs:
cat /host/v2ray.access.log | grep -q 'accepted tcp:1.0.0.1:80'
- name: Check LAN IPv4 UDP
uses: cilium/little-vm-helper@908ab1ff8a596a03cd5221a1f8602dc44c3f906d # v0.0.12
uses: cilium/little-vm-helper@9d758b756305e83718a51b792a5aeabd022a39ec # v0.0.16
with:
provision: 'false'
cmd: |
Expand All @@ -310,7 +310,7 @@ jobs:
cat /host/v2ray.access.log | grep -q 'accepted udp:8.8.4.4:53'
- name: Check LAN IPv6 TCP
uses: cilium/little-vm-helper@908ab1ff8a596a03cd5221a1f8602dc44c3f906d # v0.0.12
uses: cilium/little-vm-helper@9d758b756305e83718a51b792a5aeabd022a39ec # v0.0.16
with:
provision: 'false'
cmd: |
Expand All @@ -321,7 +321,7 @@ jobs:
cat /host/dae.log | grep -F -- '-> [2606:4700:4700::1001]:80'
- name: Check LAN IPv6 UDP
uses: cilium/little-vm-helper@908ab1ff8a596a03cd5221a1f8602dc44c3f906d # v0.0.12
uses: cilium/little-vm-helper@9d758b756305e83718a51b792a5aeabd022a39ec # v0.0.16
with:
provision: 'false'
cmd: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:

steps:
- name: Checkout codebase
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -71,7 +71,7 @@ jobs:
echo "ASSET_NAME=$_NAME" >> $GITHUB_ENV
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: '^1.21'

Expand Down Expand Up @@ -129,13 +129,13 @@ jobs:
# - name: Upload full source to Artifacts
# if: matrix.goarch == 'arm64'
# uses: actions/upload-artifact@v3
# uses: actions/upload-artifact@v4
# with:
# name: dae-full-src.zip
# path: dae-full-src.zip

- name: Upload files to Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: dae-${{ steps.get_filename.outputs.ASSET_NAME }}.zip
path: ./*.zip*
Expand All @@ -145,7 +145,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download all artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: release/

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:

steps:
- name: Checkout codebase
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -71,7 +71,7 @@ jobs:
echo "ASSET_NAME=$_NAME" >> $GITHUB_ENV
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: '^1.21'

Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
echo "$(shasum -a 512 $FILE)"" sha512" >> $FILE.dgst
- name: Upload files to Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: dae-${{ steps.get_filename.outputs.ASSET_NAME }}.zip
path: ./*.zip*
Expand All @@ -138,7 +138,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Download all artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: release/

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/seed-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:

steps:
- name: Checkout codebase
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref }}
fetch-depth: 0
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
echo "ASSET_NAME=$_NAME" >> $GITHUB_ENV
- name: Set up Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: '^1.21'

Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
shasum -a 512 $FILE >>$DGST
- name: Upload files to Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: dae-${{ steps.get_filename.outputs.ASSET_NAME }}.zip
path: build/*
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/sync-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
git_commit_msg: ${{ steps.export.outputs.git_commit_msg }}
git_run_number: ${{ steps.export.outputs.git_run_number }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Get metadata from HEAD sha
id: export
run: |
Expand All @@ -47,7 +47,7 @@ jobs:
python3 hack/ci/config-doc-generator.py
- name: Export artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pre_flight_artifacts
path: |
Expand All @@ -59,14 +59,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout to daeuniverse/dae-docs
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: daeuniverse/dae-docs
fetch-depth: 0
ref: master

- name: Copy artifacts from build job to local path
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: pre_flight_artifacts
path: docs/
Expand All @@ -81,7 +81,7 @@ jobs:
- name: Create Pull Request
id: create_pr
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v6
with:
author: daebot <[email protected]>
committer: daebot <[email protected]>
Expand Down
8 changes: 4 additions & 4 deletions docs/en/user-guide/build-by-yourself.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
### Make Dependencies

```shell
clang >= 10
llvm >= 10 (optional)
golang >= 1.18
clang >= 15
llvm >= 15
golang >= 1.21
make
```

Expand Down Expand Up @@ -45,7 +45,7 @@ curl -L -o geosite.dat https://github.com/v2fly/domain-list-community/releases/l
popd
```

### Run
### Run Program

Download the example config file:

Expand Down
Loading

0 comments on commit c21f54f

Please sign in to comment.