Skip to content

Commit

Permalink
Merge pull request #1 from hamishcoleman/main
Browse files Browse the repository at this point in the history
hard fork rebranding
  • Loading branch information
hamishcoleman authored Oct 25, 2023
2 parents cd7b3b4 + 712b78d commit 5683a49
Show file tree
Hide file tree
Showing 99 changed files with 871 additions and 2,920 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/openwrt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,26 +35,26 @@ jobs:
echo "OPENWRT_REF=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
git rev-parse --short HEAD
- name: Checkout n2n
- name: Checkout
uses: actions/checkout@v2
with:
path: n2n
path: src
fetch-depth: 0

- name: Fix Checkout
run: |
git fetch --force --tags
working-directory: n2n
working-directory: src

- name: Set n2n ref
- name: Set ref
run: |
echo "N2N_REF=$(./scripts/version.sh)" >> $GITHUB_ENV
./scripts/version.sh
working-directory: n2n
working-directory: src

- name: Copy n2n package definition into openwrt
- name: Copy src package definition into openwrt
run: |
cp -r n2n/packages/openwrt openwrt/package/n2n
cp -r src/packages/openwrt openwrt/package/n3n
working-directory: ./

- name: Cache openwrt source downloads
Expand All @@ -68,10 +68,10 @@ jobs:
echo "CONFIG_TARGET_x86=y" >.config
echo "CONFIG_TARGET_x86_64=y" >>.config
- name: Add n2n package to openwrt config
- name: Add package to openwrt config
run: |
echo "CONFIG_PACKAGE_n2n-edge=m" >>.config
echo "CONFIG_PACKAGE_n2n-supernode=m" >>.config
echo "CONFIG_PACKAGE_n3n-edge=m" >>.config
echo "CONFIG_PACKAGE_n3n-supernode=m" >>.config
- name: Build a full config from our stub file
run: |
Expand All @@ -85,19 +85,19 @@ jobs:
run: |
make -j `nproc` tools/install toolchain/install
- name: Build n2n dependancies
- name: Build dependancies
run: |
make -j `nproc` package/libs/libpcap/compile
- name: Build n2n openwrt packages
- name: Build openwrt packages
env:
N2N_PKG_VERSION: ${{ env.N2N_REF }}
run: |
echo "Build for $N2N_PKG_VERSION"
export N2N_PKG_VERSION
make package/n2n/clean V=s
make package/n2n/prepare USE_SOURCE_DIR=$GITHUB_WORKSPACE/n2n V=s
make package/n2n/compile V=s
make package/n3n/clean V=s
make package/n3n/prepare USE_SOURCE_DIR=$GITHUB_WORKSPACE/n3n V=s
make package/n3n/compile V=s
# FIXME: add a way to run the test suite!
# - name: Run embedded tests
Expand Down
30 changes: 11 additions & 19 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -375,14 +375,6 @@ jobs:
name: tests-windows
path: tests

- name: Generate coverage data
run: |
make gcov
shell: bash

- name: Upload data to codecov
uses: codecov/codecov-action@v3

package_dpkg:
name: Package for Debian/Ubuntu
needs:
Expand Down Expand Up @@ -517,33 +509,33 @@ jobs:
mv openwrt-sdk-* openwrt
working-directory: ./

- name: Checkout n2n
- name: Checkout
uses: actions/checkout@v3
with:
path: n2n
path: n3n
fetch-depth: 0

- name: Fix Checkout
run: |
git fetch --force --tags
working-directory: n2n
working-directory: n3n

- name: Copy n2n package definition into openwrt
- name: Copy package definition into openwrt
run: |
cp -r n2n/packages/openwrt openwrt/package/n2n
cp -r n3n/packages/openwrt openwrt/package/n3n
working-directory: ./

- name: Configure OpenWrt
run: |
make defconfig
- name: Build n2n openwrt packages
- name: Build openwrt packages
run: |
export N2N_PKG_VERSION=$(../n2n/scripts/version.sh)
echo "Build for $N2N_PKG_VERSION"
make package/n2n/clean V=s
make package/n2n/prepare USE_SOURCE_DIR=$GITHUB_WORKSPACE/n2n V=s
make package/n2n/compile V=s
export PKG_VERSION=$(../n3n/scripts/version.sh)
echo "Build for $PKG_VERSION"
make package/n3n/clean V=s
make package/n3n/prepare USE_SOURCE_DIR=$GITHUB_WORKSPACE/n3n V=s
make package/n3n/compile V=s
# FIXME: add a way to run the test suite!
# - name: Run embedded tests
Expand Down
10 changes: 5 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ example_edge_embed_quick_edge_init
example_edge_embed
example_sn_embed
supernode
tools/n2n-benchmark
tools/n2n-decode
tools/n2n-keygen
tools/n2n-portfwd
tools/n2n-route
tools/n3n-benchmark
tools/n3n-decode
tools/n3n-keygen
tools/n3n-portfwd
tools/n3n-route
build
.idea
.vscode
Expand Down
89 changes: 0 additions & 89 deletions CHANGELOG.md

This file was deleted.

Loading

0 comments on commit 5683a49

Please sign in to comment.