Some updates
This commit is contained in:
20
.github/workflows/build.yml
vendored
20
.github/workflows/build.yml
vendored
@@ -1,28 +1,26 @@
|
|||||||
name: Test Build
|
name: Build packages
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
|
||||||
- main
|
|
||||||
tags:
|
tags:
|
||||||
- v*
|
- v*
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: test build
|
name: Build podkop and luci-app-podkop
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4.2.1
|
- uses: actions/checkout@v4.2.1
|
||||||
|
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6.9.0
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
tags: podkop:0.1
|
tags: podkop:ci
|
||||||
|
|
||||||
- name: Create Docker container
|
- name: Create Docker container
|
||||||
run: docker create --name podkop podkop:0.1
|
run: docker create --name podkop podkop:ci
|
||||||
|
|
||||||
- name: Copy file from Docker container
|
- name: Copy file from Docker container
|
||||||
run: docker cp podkop:/builder/bin/packages/x86_64/utilites ./bin/
|
run: docker cp podkop:/builder/bin/packages/x86_64/utilites ./bin/
|
||||||
@@ -30,13 +28,7 @@ jobs:
|
|||||||
- name: Remove Docker container
|
- name: Remove Docker container
|
||||||
run: docker rm podkop
|
run: docker rm podkop
|
||||||
|
|
||||||
# - name: Upload copied file as artifact
|
|
||||||
# uses: actions/upload-artifact@v4.4.3
|
|
||||||
# with:
|
|
||||||
# name: packages
|
|
||||||
# path: ./bin/*.ipk
|
|
||||||
|
|
||||||
- name: Release
|
- name: Release
|
||||||
uses: softprops/action-gh-release@v2
|
uses: softprops/action-gh-release@v2.0.8
|
||||||
with:
|
with:
|
||||||
files: ./bin/*.ipk
|
files: ./bin/*.ipk
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
FROM openwrt/sdk:x86_64-v23.05.5
|
FROM openwrt/sdk:x86_64-v23.05.5
|
||||||
|
|
||||||
RUN mkdir -p /builder/package/feeds/utilites/
|
RUN ./scripts/feeds update -a && mkdir -p /builder/package/feeds/utilites/ && mkdir -p /builder/package/feeds/luci/
|
||||||
|
|
||||||
COPY ./podkop /builder/package/feeds/utilites/podkop
|
COPY ./podkop /builder/package/feeds/utilites/podkop
|
||||||
|
COPY ./luci-app-podkop /builder/package/feeds/luci/luci-app-podkop
|
||||||
|
|
||||||
RUN make defconfig && make package/podkop/compile V=s -j4
|
RUN make defconfig && make package/podkop/compile && make package/luci-app-podkop/compile V=s -j4
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=luci-app-podkop
|
PKG_NAME:=luci-app-podkop
|
||||||
PKG_VERSION:=1.0.1
|
PKG_VERSION:=0.1.0
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
LUCI_TITLE:=LuCI podkop app
|
LUCI_TITLE:=LuCI podkop app
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=podkop
|
PKG_NAME:=podkop
|
||||||
PKG_VERSION:=1.0.3
|
PKG_VERSION:=0.1.0
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_MAINTAINER:=ITDog <podkop@itdog.info>
|
PKG_MAINTAINER:=ITDog <podkop@itdog.info>
|
||||||
|
|||||||
@@ -16,7 +16,11 @@
|
|||||||
"server": "$HOST",
|
"server": "$HOST",
|
||||||
"server_port": "$PORT",
|
"server_port": "$PORT",
|
||||||
"method": "$METHOD",
|
"method": "$METHOD",
|
||||||
"password": "$PASS"
|
"password": "$PASS",
|
||||||
|
"udp_over_tcp": {
|
||||||
|
"enabled": true,
|
||||||
|
"version": 2
|
||||||
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"route": {
|
"route": {
|
||||||
|
|||||||
Reference in New Issue
Block a user