chore(deps): removal of vendored dependencies in favor of cargo registry caching

.cargo/config.toml

@@ -1,9 +1,3 @@
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "vendor/"
-
 [install]
 root = ".cargo"
 

.github/workflows/build-binaries.yaml

@@ -69,7 +69,7 @@ jobs:
         uses: cachix/cachix-action@v15
         with:
           name: gnosis-vpn-server
-          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
         env:
           USER: runner
       - name: Get version
@@ -92,7 +92,7 @@ jobs:
           fi
       - name: Build binary ${{ steps.vars.outputs.architecture}}
         run: |
-          nix build .#gvpn-${{ steps.vars.outputs.architecture}} -L
+          nix build .#packages.${{ steps.vars.outputs.architecture}}.gvpn -L
           mkdir -p binaries
           cp ./result/bin/gnosis_vpn-server binaries/gnosis_vpn-server-${{ steps.vars.outputs.architecture}}
           if [[ "${{ inputs.version_type }}" == "commit" ]]; then

.github/workflows/build.yml

@@ -24,7 +24,7 @@ jobs:
         uses: cachix/cachix-action@v16
         with:
           name: gnosis-vpn-server
-          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
         env:
           USER: runner
       - name: Build
@@ -40,11 +40,11 @@ jobs:
       - name: Use Nix Cache
         uses: cachix/cachix-action@v16
         with:
-          name: gnosis-vpn-client
+          name: gnosis-vpn-server
         env:
           USER: runner
       - name: Lint and formatting check
-        run: nix run .#check
+        run: nix flake check
   unittest:
     name: Unit test
     runs-on: ubuntu-24.04
@@ -56,32 +56,11 @@ jobs:
       - name: Use Nix Cache
         uses: cachix/cachix-action@v16
         with:
-          name: gnosis-vpn-client
+          name: gnosis-vpn-server
         env:
           USER: runner
       - name: Run unit tests
         run: nix build .#gvpn-test
-  systemtest:
-    name: System test
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Install Nix
-        uses: cachix/install-nix-action@v31
-      - name: Use Nix Cache
-        uses: cachix/cachix-action@v16
-        with:
-          name: gnosis-vpn-client
-          extraPullNames: "hoprnet"
-          # for some reason this fails:
-          # authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-        env:
-          USER: runner
-      - name: Install reqs via apt
-        run: sudo apt-get install -y just jq
-      - name: Run system tests
-        run: just system-setup ci-system-test
   build-binaries:
     strategy:
       matrix:

.github/workflows/cache-deps.yaml

@@ -0,0 +1,42 @@
+#################################################################################
+# Child pipeline to cache Gnosis VPN-Server dependencies
+#################################################################################
+name: Cache dependencies
+env:
+  RUST_BACKTRACE: "1"
+on:
+  workflow_call:
+    inputs:
+      branch:
+        required: true
+        type: string
+concurrency:
+  group: ${{ github.ref }}-cache-deps
+  cancel-in-progress: true
+jobs:
+  cargo:
+    runs-on: ubuntu-24.04
+    timeout-minutes: 10
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.branch }}
+          persist-credentials: false
+      - name: Replace the crates.io registry with a private proxy registry
+        env:
+          PRIVATE_CARGO_REGISTRY_PROXY_URL: ${{ secrets.PRIVATE_CARGO_REGISTRY_PROXY_URL }}
+        run: "cat >> .cargo/config.toml<< EOF        \n[source.hopr-cargo-registry-cache]\nregistry = \"sparse+${PRIVATE_CARGO_REGISTRY_PROXY_URL}\"\n    #magic___^_^___line\n[source.crates-io]\nreplace-with = \"hopr-cargo-registry-cache\"\nEOF\n    #magic___^_^___line\n"
+      - name: Install Nix
+        uses: cachix/install-nix-action@v31
+        with:
+          github_access_token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Use Nix Cache
+        uses: cachix/cachix-action@v16
+        with:
+          name: gnosis-vpn-server
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+        env:
+          USER: runner
+      - name: Cache dependencies
+        run: nix develop -c cargo fetch

.github/workflows/merge.yaml

@@ -56,3 +56,10 @@ jobs:
 
             gcloud artifacts files download --project=gnosisvpn-production --location=europe-west3 --repository=rust-binaries gnosis_vpn:${{ steps.vars.outputs.pr_version }}:gnosis_vpn-server-armv7l-linux --destination=./binaries --local-filename=gnosis_vpn-server-armv7l-linux
             ```
+  cache-deps:
+    name: Cache deps
+    if: github.event.pull_request.merged == true
+    uses: ./.github/workflows/cache-deps.yaml
+    with:
+      branch: ${{ github.event.pull_request.base.ref }}
+    secrets: inherit

.gitignore

@@ -9,9 +9,6 @@ target/
 # MSVC Windows builds of rustc generate these, which store debugging information
 *.pdb
 
-# make sure anything which is vendored is copied
-!/vendor/**/*
-
 # repo specific
 .direnv/
 /result*