delj1900full/diySH/files

Author: Calmact

.github/workflows/J1900_full.yml

@@ -11,18 +11,18 @@
 name: j1900_x86 OpenWrt
 
 on:
-  push:
-    branches:
-      - main
+#  push:
+#    branches:
+#      - main
   repository_dispatch:
   workflow_dispatch:
     inputs:
       ssh:
         description: 'SSH connection to Actions'
         required: true
         default: 'false'
-  schedule:
-    - cron: 0 19 * * *
+#  schedule:
+#    - cron: 0 19 * * *
 #  watch:
 #    types: started
 

.github/workflows/J1900_immortal.yml

@@ -31,8 +31,8 @@ env:
   REPO_BRANCH: master
   FEEDS_CONF: feeds.conf.default
   CONFIG_FILE: config/j1900imt.config
-  DIY_P1_SH: diyJ1900imt-part1.sh
-  DIY_P2_SH: diyJ1900imt-part2.sh
+#  DIY_P1_SH: diyJ1900imt-part1.sh
+#  DIY_P2_SH: diyJ1900imt-part2.sh
   UPLOAD_BIN_DIR: true
   UPLOAD_FIRMWARE: true
   UPLOAD_COWTRANSFER: false
@@ -76,9 +76,10 @@ jobs:
     - name: Load custom feeds
       run: |
         [ -e $FEEDS_CONF ] && mv $FEEDS_CONF openwrt/feeds.conf.default
-        chmod +x $DIY_P1_SH
+        #chmod +x $DIY_P1_SH
         cd openwrt
-        $GITHUB_WORKSPACE/$DIY_P1_SH
+        $GITHUB_WORKSPACE/$DIY_P1_SH        
+        #echo 'src-git kenzok8_small_package https://github.com/kenzok8/small-package' >>feeds.conf.default
         git clone https://github.com/BROBIRD/openwrt-r8168 ./package/r8168
 
     - name: Update feeds
@@ -100,15 +101,32 @@ jobs:
       run: |
         [ -e files ] && mv files openwrt/files
         [ -e $CONFIG_FILE ] && mv $CONFIG_FILE openwrt/.config
-        chmod +x $DIY_P2_SH
+        #chmod +x $DIY_P2_SH
         cd openwrt
-        $GITHUB_WORKSPACE/$DIY_P2_SH
-        curl -fsSL git.io/file-transfer | sh
-        ./transfer cow --block 2621440 -s -p 64 --no-progress .config 2>&1 | tee cowtransfer.log
-        echo "::warning file=cowtransfer.com::$(cat cowtransfer.log | grep https)"
-        echo "::set-output name=url::$(cat cowtransfer.log | grep https | cut -f3 -d" ")"
         
+        #$GITHUB_WORKSPACE/$DIY_P2_SH
+        # Modify default IP
+        #sed -i 's/192.168.1.1/192.168.30.3/g' package/base-files/files/bin/config_generate
+        sed -i 's/192.168.1.1/192.168.30.3/g' .config
+        sed -i 's/192.168.30.255/192.168.30.255/g' .config
+        # Modify hostname
+        # sed -i 's/OpenWrt/OpenWrt-Calmact/g' package/base-files/files/bin/config_generate
+        
+        # Add kernel build user
+        # [ -z $(grep "CONFIG_KERNEL_BUILD_USER=" .config) ] &&
+        #     echo 'CONFIG_KERNEL_BUILD_USER="Calmact"' >>.config ||
+        #     sed -i 's@\(CONFIG_KERNEL_BUILD_USER=\).*@\1$"Calmact"@' .config
         
+        # Add kernel build domain
+        # [ -z $(grep "CONFIG_KERNEL_BUILD_DOMAIN=" .config) ] &&
+        #     echo 'CONFIG_KERNEL_BUILD_DOMAIN="GitHub Actions"' >>.config ||
+        #     sed -i 's@\(CONFIG_KERNEL_BUILD_DOMAIN=\).*@\1$"GitHub Actions"@' .config
+        
+        
+        curl -fsSL git.io/file-transfer | sh
+        ./transfer wet -s -p 16 --no-progress .config 2>&1 | tee wetransfer.log
+        echo "::warning file=wetransfer.com::$(cat wetransfer.log | grep https)"
+        echo "::set-output name=url::$(cat wetransfer.log | grep https | cut -f3 -d" ")"       
 
     - name: SSH connection to Actions
       uses: P3TERX/[email protected]
@@ -126,6 +144,7 @@ jobs:
         make check | tee check.log
         find dl -size -1024c -exec ls -l {} \;
         find dl -size -1024c -exec rm -f {} \;
+        
     - name: Compile the firmware
       id: compile
       run: |
@@ -141,11 +160,11 @@ jobs:
       run: |
         cd openwrt
         [ -e .config ] && mv .config ./bin/targets/x86/64/.config  
+        [ -e build_j8.log ] && mv build_j8.log ./bin/targets/x86/64/build_j8.log 
+        [ -e build_j2.log ] && mv build_j2.log ./bin/targets/x86/64/build_j2.log   
         [ -e feeds.conf.default ] && mv feeds.conf.default ./bin/targets/x86/64/feeds.conf.default  
         [ -e download.log ] && mv download.log ./bin/targets/x86/64/download.log
         [ -e check.log ] && mv check.log ./bin/targets/x86/64/check.log
-        [ -e build_j8.log ] && mv build_j8.log ./bin/targets/x86/64/build_j8.log 
-        [ -e build_j2.log ] && mv build_j2.log ./bin/targets/x86/64/build_j2.log   
                 
     - name: Check space usage
       if: (!cancelled())