Skip to content

Commit e5c79ae

Browse files
committed
Move server/linux to server
1 parent c9313a1 commit e5c79ae

23 files changed

+5
-6
lines changed

.github/workflows/builtAndTest.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,27 +93,27 @@ jobs:
9393
repository: "seladb/PcapPlusPlus"
9494
tag: "v${{env.PCAPPLUSPLUS_LATEST_VERSION}}"
9595
fileName: "pcapplusplus-${{env.PCAPPLUSPLUS_LATEST_VERSION}}-ubuntu-${{env.DISTRO_VERSION}}-gcc-*.tar.gz"
96-
out-file-path: "server/linux/libs"
96+
out-file-path: "server/libs"
9797
tarBall: true
9898
extract: true
9999

100100
- name: Rename PcapPlusPlus directory
101101
run: |
102-
export RELEASE_DIR=$(find "$GITHUB_WORKSPACE/server/linux/libs" -maxdepth 1 -type d -name 'pcapplusplus*' | head -n 1)
102+
export RELEASE_DIR=$(find "$GITHUB_WORKSPACE/server/libs" -maxdepth 1 -type d -name 'pcapplusplus*' | head -n 1)
103103
if [ -z "$RELEASE_DIR" ]; then
104104
echo "Error: No directory matching 'pcapplusplus*' found."
105105
exit 1
106106
fi
107107
echo Release dir: $RELEASE_DIR
108-
mv $RELEASE_DIR $GITHUB_WORKSPACE/server/linux/libs/pcapplusplus
108+
mv $RELEASE_DIR $GITHUB_WORKSPACE/server/libs/pcapplusplus
109109
110110
- name: Install dependencies
111111
run: |
112112
sudo apt update && sudo apt -y install libpcap-dev
113113
114114
- name: Build VPN server
115115
run: |
116-
cd server/linux
116+
cd server
117117
cmake -S . -B build
118118
cmake --build build
119119
@@ -130,4 +130,4 @@ jobs:
130130
uses: jidicula/clang-format-action@v4.14.0
131131
with:
132132
clang-format-version: "19"
133-
exclude-regex: "(^|/)(app/libs|server/linux/libs)/"
133+
exclude-regex: "(^|/)(app/libs|server/libs)/"

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,4 @@
1616
.externalNativeBuild
1717
.cxx
1818
local.properties
19-
/server/linux/ToyVpnServer
2019
/app/libs/*
File renamed without changes.

0 commit comments

Comments
 (0)