Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [ master ]
branches: [ master, v2 ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
branches: [ master, v2 ]
schedule:
- cron: '42 15 * * 3'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: E2E Tests

on:
pull_request:
branches: [ master, main ]
branches: [ master, v2 ]
types: [ opened, synchronize, reopened ]
push:
branches: [ master, main ]
branches: [ master, v2 ]

permissions:
contents: read
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/go-c-cpp.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: GO/C/C++ CI
on:
push:
branches: [ master ]
branches: [ master, v2 ]
pull_request:
branches: [ master ]
branches: [ master, v2 ]

jobs:
build-on-ubuntu2204:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_build_debug.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: PR Build (Debug)
on:
pull_request:
branches: [ master, main ]
branches: [ master, v2 ]
types: [ opened, synchronize, reopened ]

permissions:
Expand Down
50 changes: 47 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,24 @@ jobs:
- uses: actions/setup-go@v5
with:
go-version: '1.24.6'
- name: Check Release Type
id: release_type
run: |
TAG_NAME=${{ github.ref_name }}
if [[ "$TAG_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
echo "IS_PRERELEASE=false" >> $GITHUB_OUTPUT
echo "RELEASE_TYPE=stable" >> $GITHUB_OUTPUT
echo "📦 Stable release detected: $TAG_NAME"
elif [[ "$TAG_NAME" =~ (alpha|beta|rc) ]]; then
echo "IS_PRERELEASE=true" >> $GITHUB_OUTPUT
echo "RELEASE_TYPE=prerelease" >> $GITHUB_OUTPUT
echo "🚧 Pre-release detected: $TAG_NAME"
else
echo "IS_PRERELEASE=false" >> $GITHUB_OUTPUT
echo "RELEASE_TYPE=stable" >> $GITHUB_OUTPUT
echo "📦 Release: $TAG_NAME"
fi
shell: bash
- name: Install Compilers
run: |
sudo apt-get update
Expand Down Expand Up @@ -96,13 +114,27 @@ jobs:
make env
CROSS_ARCH=arm64 make -f builder/Makefile.release release SNAPSHOT_VERSION=${{ github.ref_name }}
- name: Publish
env:
IS_PRERELEASE: ${{ steps.release_type.outputs.IS_PRERELEASE }}
run: |
make -f builder/Makefile.release publish SNAPSHOT_VERSION=${{ github.ref_name }}
build-docker-image:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Check Release Type
id: release_type
run: |
TAG_NAME=${{ github.ref_name }}
if [[ "$TAG_NAME" =~ (alpha|beta|rc) ]]; then
echo "IS_PRERELEASE=true" >> $GITHUB_OUTPUT
echo "🚧 Pre-release detected for Docker: $TAG_NAME"
else
echo "IS_PRERELEASE=false" >> $GITHUB_OUTPUT
echo "📦 Stable release detected for Docker: $TAG_NAME"
fi
shell: bash
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
Expand All @@ -114,6 +146,20 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Update submodule
run: git submodule update --init
- name: Prepare Docker Tags
id: docker_tags
run: |
TAGS="${{ secrets.DOCKERHUB_USERNAME }}/ecapture:${{ github.ref_name }}"
if [[ "${{ steps.release_type.outputs.IS_PRERELEASE }}" == "false" ]]; then
TAGS="${TAGS}
${{ secrets.DOCKERHUB_USERNAME }}/ecapture:latest"
echo "📦 Adding 'latest' tag for stable release"
else
echo "🚧 Skipping 'latest' tag for pre-release"
fi
echo "TAGS<<EOF" >> $GITHUB_OUTPUT
echo "$TAGS" >> $GITHUB_OUTPUT
echo "EOF" >> $GITHUB_OUTPUT
- name: Build and push
uses: docker/build-push-action@v5
with:
Expand All @@ -124,6 +170,4 @@ jobs:
push: true
cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/ecapture:buildcache
cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/ecapture:buildcache,mode=max
tags: |
${{ secrets.DOCKERHUB_USERNAME }}/ecapture:${{ github.ref_name }}
${{ secrets.DOCKERHUB_USERNAME }}/ecapture:latest
tags: ${{ steps.docker_tags.outputs.TAGS }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ bin/*
/.check*
/deps/*
/assets/probe.go
docs/blog/*

# Example binaries
/examples/ecaptureq_client/ecaptureq_client
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ See [CONTRIBUTING](./CONTRIBUTING.md) for details on submitting patches and the
# Compilation
## Custom Compilation

You can customize the features you want, such as setting the offset address for `uprobe` to support statically compiled OpenSSL libraries. Refer to the [COMPILATION](./COMPILATION.md) introduction for compilation instructions.
You can customize the features you want, such as setting the offset address for `uprobe` to support statically compiled OpenSSL libraries. Refer to the [compilation guide](./docs/compilation.md) for compilation instructions.

## Configurations Remote Update

Expand Down
2 changes: 1 addition & 1 deletion README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ https://github.com/user-attachments/assets/c8b7a84d-58eb-4fdb-9843-f775c97bdbfb
# 二次开发
## 自行编译
你可以定制自己想要的功能,比如设定`uprobe`
的偏移地址,用来支持被静态编译的Openssl类库。编译方法可以参考 [COMPILATION](./COMPILATION_CN.md)的介绍。
的偏移地址,用来支持被静态编译的Openssl类库。编译方法可以参考 [编译指南](./docs/compilation-cn.md) 的介绍。

## 动态修改配置
当eCapture运行后,你可以通过HTTP接口动态修改配置,参考[HTTP API 文档](./docs/remote-config-update-api_CN.md)。
Expand Down
2 changes: 1 addition & 1 deletion README_JA.md
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ eCapture / eCaptureQ が出力する Protobuf ログのスキーマ詳細につ

# コンパイル

あなたは自分で望む機能をカスタマイズすることができます。たとえば、静的コンパイルされたOpensslライブラリをサポートするために`uprobe`のオフセットアドレスを設定することができます。コンパイル方法については、[COMPILATION](./COMPILATION_CN.md)の説明を参照してください。
あなたは自分で望む機能をカスタマイズすることができます。たとえば、静的コンパイルされたOpensslライブラリをサポートするために`uprobe`のオフセットアドレスを設定することができます。コンパイル方法については、[コンパイルガイド](./docs/compilation-cn.md) の説明を参照してください。

# WeChat公式アカウント
![](./images/wechat_gzhh.png)
Expand Down
15 changes: 0 additions & 15 deletions assets/doc.go

This file was deleted.

8 changes: 7 additions & 1 deletion builder/Makefile.release
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,13 @@ publish: \
@$(CMD_CD) $(OUTPUT_DIR)
@$(CMD_CHECKSUM) ecapture*v* | $(CMD_SED) 's/.\/bin\///g' > $(OUT_CHECKSUMS)
@FILES=$$(ls ecapture-*.tar.gz ecapture*.deb checksum-*.txt)
@$(CMD_GITHUB) release create $(DEB_VERSION) $$FILES --title "eCapture $(DEB_VERSION)" --notes-file $(RELEASE_NOTES)
@if [ "$(IS_PRERELEASE)" = "true" ]; then \
echo "🚧 Publishing as pre-release: $(DEB_VERSION)"; \
$(CMD_GITHUB) release create $(DEB_VERSION) $$FILES --title "eCapture $(DEB_VERSION)" --notes-file $(RELEASE_NOTES) --prerelease; \
else \
echo "📦 Publishing as stable release: $(DEB_VERSION)"; \
$(CMD_GITHUB) release create $(DEB_VERSION) $$FILES --title "eCapture $(DEB_VERSION)" --notes-file $(RELEASE_NOTES); \
fi

.PHONY: clean
clean:
Expand Down
Loading
Loading