Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix/ci: fix argument list too lang due to packed and use clang-15 #162

Merged
merged 2 commits into from
Jun 27, 2023
Merged

fix/ci: fix argument list too lang due to packed and use clang-15 #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09ebc16
chore: revert packed
mzz2017 Jun 27, 2023
e57a8c6
ci: use clang-15 and llvm-15 for build
mzz2017 Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
- name: Install Dependencies
run: |
sudo apt-get update -y
sudo apt-get install -y clang llvm
sudo apt-get install -y clang-15 llvm-15

- name: Get project dependencies
run: |
Expand All @@ -117,6 +117,8 @@ jobs:
export CFLAGS="-D__REMOVE_BPF_PRINTK"
export OUTPUT=build/dae-$ASSET_NAME
export VERSION=${{ steps.get_version.outputs.VERSION }}
export CLANG=clang-15
export STRIP=llvm-strip-15
make
cp ./install/dae.service ./build/
cp ./example.dae ./build/
Expand Down Expand Up @@ -144,4 +146,3 @@ jobs:
with:
name: dae-${{ steps.get_filename.outputs.ASSET_NAME }}.zip
path: build/*

6 changes: 4 additions & 2 deletions .github/workflows/prerelease.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
- name: Install Dependencies
run: |
sudo apt-get update -y
sudo apt-get install -y clang llvm
sudo apt-get install -y clang-15 llvm-15

- name: Get project dependencies
run: |
Expand All @@ -96,7 +96,7 @@ jobs:
echo "$(shasum -a 1 $FILE)"" sha1" >> $FILE.dgst
echo "$(shasum -a 256 $FILE)"" sha256" >> $FILE.dgst
echo "$(shasum -a 512 $FILE)"" sha512" >> $FILE.dgst

- name: Build dae
run: |
mkdir -p ./build/
Expand All @@ -105,6 +105,8 @@ jobs:
export CFLAGS="-D__REMOVE_BPF_PRINTK"
export OUTPUT=build/dae-$ASSET_NAME
export VERSION=${{ steps.get_version.outputs.VERSION }}
export CLANG=clang-15
export STRIP=llvm-strip-15
make
cp ./install/dae.service ./build/
cp ./example.dae ./build/
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
- name: Install Dependencies
run: |
sudo apt-get update -y
sudo apt-get install -y clang llvm
sudo apt-get install -y clang-15 llvm-15

- name: Get project dependencies
run: |
Expand All @@ -96,7 +96,7 @@ jobs:
echo "$(shasum -a 1 $FILE)"" sha1" >> $FILE.dgst
echo "$(shasum -a 256 $FILE)"" sha256" >> $FILE.dgst
echo "$(shasum -a 512 $FILE)"" sha512" >> $FILE.dgst

- name: Build dae
run: |
mkdir -p ./build/
Expand All @@ -105,6 +105,8 @@ jobs:
export CFLAGS="-D__REMOVE_BPF_PRINTK"
export OUTPUT=build/dae-$ASSET_NAME
export VERSION=${{ steps.get_version.outputs.VERSION }}
export CLANG=clang-15
export STRIP=llvm-strip-15
make
cp ./install/dae.service ./build/
cp ./example.dae ./build/
Expand Down
2 changes: 1 addition & 1 deletion control/kern/tproxy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ struct routing_result {
__u32 pid;
};

struct __attribute__((packed)) dst_routing_result {
struct dst_routing_result {
__be32 ip[4];
__be16 port;
__u16 recognize;
Expand Down