diff --git a/.github/workflows/docker_build_push.yml b/.github/workflows/docker_build_push.yml index f7cea2b..4b15d10 100644 --- a/.github/workflows/docker_build_push.yml +++ b/.github/workflows/docker_build_push.yml @@ -53,7 +53,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive @@ -69,6 +69,12 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 + - name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Login to GitHub Container Registry uses: docker/login-action@v2 with: @@ -76,12 +82,6 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Nightly build test on amd64 for pull requests if: ${{ github.event_name == 'pull_request' }} uses: docker/build-push-action@v4 diff --git a/Cargo.toml b/Cargo.toml index 29e2277..c512b18 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,7 @@ members = ["rpxy-bin", "rpxy-lib"] exclude = ["submodules"] +resolver = "2" [profile.release] codegen-units = 1 diff --git a/submodules/quinn b/submodules/quinn index 7f26029..307d80b 160000 --- a/submodules/quinn +++ b/submodules/quinn @@ -1 +1 @@ -Subproject commit 7f260292848a93d615eb43e6e88114a97e64daf1 +Subproject commit 307d80b9398d4e1e305c0131f2c3989090ec9432 diff --git a/submodules/s2n-quic b/submodules/s2n-quic index e6402b7..047f695 160000 --- a/submodules/s2n-quic +++ b/submodules/s2n-quic @@ -1 +1 @@ -Subproject commit e6402b7f8649bc9d90b69aedc83c387b0372bc94 +Subproject commit 047f695aeb6219fc2bde54b95cd1915d73d1c92b