测试

2025-12-19 09:56:46 +08:00 · 2025-02-06 17:08:29 +08:00
parent 1337fef75d
commit ccca7efa74
5 changed files with 45 additions and 45 deletions
--- a/.github/workflows/ipk.yml
+++ b/.github/workflows/ipk.yml
@@ -34,7 +34,7 @@ jobs:
          key-id: ${{ secrets.ALIYUN_OSS_ID }}
          key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
          bucket: ide-qbcode
-          asset-path: ./public/publish/ipk/linker-musl-x64-ipk/linker-x64.ipk
+          asset-path: ./public/publish-ipk/x64/linker-x64.ipk
          target-path: /downloads/linker/v1.6.6/linker-x64.ipk
      - name: upload-x64
        id: upload-x64
@@ -43,7 +43,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
        with:
          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./public/publish/ipk/linker-musl-x64-ipk/linker-x64.ipk
+          asset_path: ./public/publish-ipk/x64/linker-x64.ipk
          asset_name: linker-x64.ipk
          asset_content_type: application/ipk
      - name: upload-arm-oss
@@ -54,7 +54,7 @@ jobs:
          key-id: ${{ secrets.ALIYUN_OSS_ID }}
          key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
          bucket: ide-qbcode
-          asset-path: ./public/publish/ipk/linker-musl-arm-ipk/linker-arm.ipk
+          asset-path: ./public/publish-ipk/arm/linker-arm.ipk
          target-path: /downloads/linker/v1.6.6/linker-arm.ipk
      - name: upload-arm
        id: upload-arm
@@ -63,7 +63,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
        with:
          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./public/publish/ipk/linker-musl-arm-ipk/linker-arm.ipk
+          asset_path: ./public/publish-ipk/arm/linker-arm.ipk
          asset_name: linker-arm.ipk
          asset_content_type: application/ipk
      - name: upload-arm64-oss
@@ -74,7 +74,7 @@ jobs:
          key-id: ${{ secrets.ALIYUN_OSS_ID }}
          key-secret: ${{ secrets.ALIYUN_OSS_SECRET }}
          bucket: ide-qbcode
-          asset-path: ./public/publish/ipk/linker-musl-arm64-ipk/linker-arm64.ipk
+          asset-path: ./public/publish-ipk/arm64/linker-arm64.ipk
          target-path: /downloads/linker/v1.6.6/linker-arm64.ipk
      - name: upload-arm64
        id: upload-arm64
@@ -83,6 +83,6 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.ACTIONS_TOKEN }}
        with:
          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./public/publish/ipk/linker-musl-arm64-ipk/linker-arm64.ipk
+          asset_path: ./public/publish-ipk/arm64/linker-arm64.ipk
          asset_name: linker-arm64.ipk
          asset_content_type: application/ipk
--- a/gen/index.js
+++ b/gen/index.js
@@ -171,7 +171,7 @@ function writeUploadIpk(data, tagName) {
                'key-id': '${{ secrets.ALIYUN_OSS_ID }}',
                'key-secret': '${{ secrets.ALIYUN_OSS_SECRET }}',
                'bucket': 'ide-qbcode',
-                'asset-path': `./public/publish/ipk/linker-musl-${arch}-ipk/linker-${arch}.ipk`,
+                'asset-path': `./public/publish-ipk/${arch}/linker-${arch}.ipk`,
                'target-path': `/downloads/linker/${tagName}/linker-${arch}.ipk`
            }
        });
@@ -184,7 +184,7 @@ function writeUploadIpk(data, tagName) {
            },
            with: {
                'upload_url': '${{ steps.create_release.outputs.upload_url }}',
-                'asset_path': `./public/publish/ipk/linker-musl-${arch}-ipk/linker-${arch}.ipk`,
+                'asset_path': `./public/publish-ipk/${arch}/linker-${arch}.ipk`,
                'asset_name': `linker-${arch}.ipk`,
                'asset_content_type': 'application/ipk'
            }
--- a/publish-ipk.sh
+++ b/publish-ipk.sh
@@ -9,34 +9,34 @@ cd ../../

 for r in ${rs[@]} 
 do
-    dotnet publish ./src/linker -c release -f net8.0 -o ./public/publish/ipk/linux-musl-${r}/linker -r linux-musl-${r}  -p:PublishSingleFile=true  --self-contained true  -p:TrimMode=partial -p:TieredPGO=true  -p:DebugType=none -p:EventSourceSupport=false -p:DebugSymbols=false -p:EnableCompressionInSingleFile=true -p:DebuggerSupport=false -p:EnableUnsafeBinaryFormatterSerialization=false -p:EnableUnsafeUTF7Encoding=false -p:HttpActivityPropagationSupport=false -p:InvariantGlobalization=true  -p:MetadataUpdaterSupport=false  -p:UseSystemResourceKeys=true -p:MetricsSupport=false -p:StackTraceSupport=false -p:XmlResolverIsNetworkingEnabledByDefault=false
-    cp -rf public/extends/any/web public/publish/ipk/linux-musl-${r}/linker/web
-    mkdir -p public/publish/ipk/linux-musl-${r}/linker/configs
-    mkdir -p public/publish/ipk/linux-musl-${r}/linker/logs
-    cp -rf src/linker/libmsquic-musl-${r}.so public/publish/ipk/linux-musl-${r}/linker/libmsquic.so
+    dotnet publish ./src/linker -c release -f net8.0 -o ./public/publish-ipk/${r}/linker -r linux-musl-${r}  -p:PublishSingleFile=true  --self-contained true  -p:TrimMode=partial -p:TieredPGO=true  -p:DebugType=none -p:EventSourceSupport=false -p:DebugSymbols=false -p:EnableCompressionInSingleFile=true -p:DebuggerSupport=false -p:EnableUnsafeBinaryFormatterSerialization=false -p:EnableUnsafeUTF7Encoding=false -p:HttpActivityPropagationSupport=false -p:InvariantGlobalization=true  -p:MetadataUpdaterSupport=false  -p:UseSystemResourceKeys=true -p:MetricsSupport=false -p:StackTraceSupport=false -p:XmlResolverIsNetworkingEnabledByDefault=false
+    cp -rf public/extends/any/web public/publish-ipk/${r}/linker/web
+    mkdir -p public/publish-ipk/${r}/linker/configs
+    mkdir -p public/publish-ipk/${r}/linker/logs
+    cp -rf src/linker/libmsquic-musl-${r}.so public/publish-ipk/${r}/linker/libmsquic.so

-    cp -rf ipk public/publish/ipk/linux-musl-${r}-ipk
-    mkdir -p public/publish/ipk/linux-musl-${r}-ipk/data/usr/bin/linker
-    cp -rf public/publish/ipk/linux-musl-${r} public/publish/ipk/linux-musl-${r}-ipk/data/usr/bin/linker
-    sed -i "s|{version}|1.6.6|g" public/publish/ipk/linux-musl-${r}-ipk/control/control
-    chmod +x public/publish/ipk/linux-musl-${r}-ipk/data/etc/init.d/linker
-    chmod +x public/publish/ipk/linux-musl-${r}-ipk/control/control
-    chmod +x public/publish/ipk/linux-musl-${r}-ipk/control/postinst
-    chmod +x public/publish/ipk/linux-musl-${r}-ipk/control/prerm
+    cp -rf ipk public/publish-ipk/${r}
+    mkdir -p public/publish-ipk/${r}/data/usr/bin/linker
+    cp -rf public/publish-ipk/${r} public/publish-ipk/${r}/data/usr/bin/linker
+    sed -i "s|{version}|1.6.6|g" public/publish-ipk/${r}/control/control
+    chmod +x public/publish-ipk/${r}/data/etc/init.d/linker
+    chmod +x public/publish-ipk/${r}/control/control
+    chmod +x public/publish-ipk/${r}/control/postinst
+    chmod +x public/publish-ipk/${r}/control/prerm
 done

-sed -i "s|{arch}|amd64|g" public/publish/ipk/linux-musl-x64-ipk/data/etc/init.d/linker
-sed -i "s|{arch}|aarch64|g" public/publish/ipk/linux-musl-arm64-ipk/data/etc/init.d/linker
-sed -i "s|{arch}|arm|g" public/publish/ipk/linux-musl-arm-ipk/data/etc/init.d/linker
+sed -i "s|{arch}|amd64|g" public/publish-ipk/x64/data/etc/init.d/linker
+sed -i "s|{arch}|aarch64|g" public/publish/arm64-ipk/data/etc/init.d/linker
+sed -i "s|{arch}|arm|g" public/publish-ipk/arm/data/etc/init.d/linker

 for r in ${rs[@]} 
 do
-    cd public/publish/ipk/linux-musl-${r}-ipk
+    cd public/publish-ipk/${r}
    tar -czvf data.tar.gz -C data .
    tar -czvf control.tar.gz -C control .
    echo "2.0" > debian-binary
    ar r linker-${r}.ipk debian-binary data.tar.gz control.tar.gz
    ls 
    pwd
-    cd ../../../../
+    cd ../../../
 done
--- a/version.txt
+++ b/version.txt
@@ -1,5 +1,5 @@
 v1.6.6
-2025-02-06 16:57:39
+2025-02-06 17:08:28
 1. 适配OpenWrt的NAT
 2. 测试打包ipk
 3. 不要更新，不要更新，不要更新，请使用v1.6.5
--- a/ymls/publish-ipk.sh
+++ b/ymls/publish-ipk.sh
@@ -9,34 +9,34 @@ cd ../../

 for r in ${rs[@]} 
 do
-    dotnet publish ./src/linker -c release -f net8.0 -o ./public/publish/ipk/linux-musl-${r}/linker -r linux-musl-${r}  -p:PublishSingleFile=true  --self-contained true  -p:TrimMode=partial -p:TieredPGO=true  -p:DebugType=none -p:EventSourceSupport=false -p:DebugSymbols=false -p:EnableCompressionInSingleFile=true -p:DebuggerSupport=false -p:EnableUnsafeBinaryFormatterSerialization=false -p:EnableUnsafeUTF7Encoding=false -p:HttpActivityPropagationSupport=false -p:InvariantGlobalization=true  -p:MetadataUpdaterSupport=false  -p:UseSystemResourceKeys=true -p:MetricsSupport=false -p:StackTraceSupport=false -p:XmlResolverIsNetworkingEnabledByDefault=false
-    cp -rf public/extends/any/web public/publish/ipk/linux-musl-${r}/linker/web
-    mkdir -p public/publish/ipk/linux-musl-${r}/linker/configs
-    mkdir -p public/publish/ipk/linux-musl-${r}/linker/logs
-    cp -rf src/linker/libmsquic-musl-${r}.so public/publish/ipk/linux-musl-${r}/linker/libmsquic.so
+    dotnet publish ./src/linker -c release -f net8.0 -o ./public/publish-ipk/${r}/linker -r linux-musl-${r}  -p:PublishSingleFile=true  --self-contained true  -p:TrimMode=partial -p:TieredPGO=true  -p:DebugType=none -p:EventSourceSupport=false -p:DebugSymbols=false -p:EnableCompressionInSingleFile=true -p:DebuggerSupport=false -p:EnableUnsafeBinaryFormatterSerialization=false -p:EnableUnsafeUTF7Encoding=false -p:HttpActivityPropagationSupport=false -p:InvariantGlobalization=true  -p:MetadataUpdaterSupport=false  -p:UseSystemResourceKeys=true -p:MetricsSupport=false -p:StackTraceSupport=false -p:XmlResolverIsNetworkingEnabledByDefault=false
+    cp -rf public/extends/any/web public/publish-ipk/${r}/linker/web
+    mkdir -p public/publish-ipk/${r}/linker/configs
+    mkdir -p public/publish-ipk/${r}/linker/logs
+    cp -rf src/linker/libmsquic-musl-${r}.so public/publish-ipk/${r}/linker/libmsquic.so

-    cp -rf ipk public/publish/ipk/linux-musl-${r}-ipk
-    mkdir -p public/publish/ipk/linux-musl-${r}-ipk/data/usr/bin/linker
-    cp -rf public/publish/ipk/linux-musl-${r} public/publish/ipk/linux-musl-${r}-ipk/data/usr/bin/linker
-    sed -i "s|{version}|{{version}}|g" public/publish/ipk/linux-musl-${r}-ipk/control/control
-    chmod +x public/publish/ipk/linux-musl-${r}-ipk/data/etc/init.d/linker
-    chmod +x public/publish/ipk/linux-musl-${r}-ipk/control/control
-    chmod +x public/publish/ipk/linux-musl-${r}-ipk/control/postinst
-    chmod +x public/publish/ipk/linux-musl-${r}-ipk/control/prerm
+    cp -rf ipk public/publish-ipk/${r}
+    mkdir -p public/publish-ipk/${r}/data/usr/bin/linker
+    cp -rf public/publish-ipk/${r} public/publish-ipk/${r}/data/usr/bin/linker
+    sed -i "s|{version}|{{version}}|g" public/publish-ipk/${r}/control/control
+    chmod +x public/publish-ipk/${r}/data/etc/init.d/linker
+    chmod +x public/publish-ipk/${r}/control/control
+    chmod +x public/publish-ipk/${r}/control/postinst
+    chmod +x public/publish-ipk/${r}/control/prerm
 done

-sed -i "s|{arch}|amd64|g" public/publish/ipk/linux-musl-x64-ipk/data/etc/init.d/linker
-sed -i "s|{arch}|aarch64|g" public/publish/ipk/linux-musl-arm64-ipk/data/etc/init.d/linker
-sed -i "s|{arch}|arm|g" public/publish/ipk/linux-musl-arm-ipk/data/etc/init.d/linker
+sed -i "s|{arch}|amd64|g" public/publish-ipk/x64/data/etc/init.d/linker
+sed -i "s|{arch}|aarch64|g" public/publish/arm64-ipk/data/etc/init.d/linker
+sed -i "s|{arch}|arm|g" public/publish-ipk/arm/data/etc/init.d/linker

 for r in ${rs[@]} 
 do
-    cd public/publish/ipk/linux-musl-${r}-ipk
+    cd public/publish-ipk/${r}
    tar -czvf data.tar.gz -C data .
    tar -czvf control.tar.gz -C control .
    echo "2.0" > debian-binary
    ar r linker-${r}.ipk debian-binary data.tar.gz control.tar.gz
    ls 
    pwd
-    cd ../../../../
+    cd ../../../
 done