diff --git a/.github/workflows/Nodes.yaml b/.github/workflows/Nodes.yaml index eb2029c17..b21f647be 100644 --- a/.github/workflows/Nodes.yaml +++ b/.github/workflows/Nodes.yaml @@ -13,138 +13,95 @@ on: jobs: - re-job: - name: Reuse + my-job: + name: Max Job runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 #git clone - - name: init - run: | #配置git上传用户名和邮箱 - git config pull.rebase false - git config --local user.name "GitHub Actions" - git config --local user.email "actions@github.com" - - name: pool.yaml - run: | #input./utils/pool/pool - ./utils/subconverter/subconverter -g --artifact "pool" - sed -i '1,34d' ./utils/subconverter/pool.yaml #删除pool.yaml开头1-6行 - mv ./utils/subconverter/pool.yaml ./utils/pool/pool.yaml - - run: ./.github/update-repo.sh || true #output./utils/pool/pool.yaml - - cs-job: #input./utils/pool/config.yaml ./utils/clashcheck/config.yaml - name: Collecting & Speedtest - needs: re-job - runs-on: ubuntu-latest - steps: + steps: - uses: actions/checkout@v3 #git clone + - uses: actions/setup-node@v3 #Node.js环境 + with: + node-version: 16 #node.js 16 - uses: actions/setup-python@v4 #python环境 with: - python-version: '3.x' - cache: 'pip' + python-version: '3.x' #python 3.x + cache: 'pip' #pip cache - name: Timezone #UTC+0 → UTC+8 run: sudo timedatectl set-timezone 'Asia/Shanghai' - - name: init - run: | #配置git上传用户名和邮箱 + - name: git + run: | #配置git的上传用户名和邮箱 git config pull.rebase false git config --local user.name "GitHub Actions" git config --local user.email "actions@github.com" - - name: requirements.txt - run: | #安装python包 + - name: npm + run: | #安裝npm包 + cd ./utils/rm/ && npm ci + - name: pip + run: | #安装pip包 pip install -r ./utils/pool/requirements.txt pip install -r ./utils/clashcheck/requirements.txt - name: pool #input./utils/pool/config.yaml run: cd ./utils/pool/ && timeout -k 30s 15m python main.py || true #output./utils/pool/output.yaml - - name: copy - run: cp ./utils/pool/output.yaml ./utils/clashcheck/input.yaml - - name: clashcheck #input./utils/clashcheck/config.yaml + - name: copy pool to clashcheck #input./utils/pool/output.yaml + run: cp ./utils/pool/output.yaml ./utils/clashcheck/input.yaml #output./utils/clashcheck/input.yaml + - name: clashcheck #because./utils/pool/config.yaml so input./utils/clashcheck/input.yaml run: cd ./utils/clashcheck/ && python main.py && python main.py && python main.py #output./utils/clashcheck/check.yaml - - run: ./.github/update-repo.sh || true #output./utils/pool/output.yaml ./utils/clashcheck/input.yaml ./utils/clashcheck/check.yaml - - rr-job: #input./utils/clashcheck/check.yaml - name: Remove & Remark - needs: cs-job - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 #git clone - - uses: actions/setup-node@v3 #Node.js环境 - with: - node-version: 16 - - name: Timezone #UTC+0 → UTC+8 - run: sudo timedatectl set-timezone 'Asia/Shanghai' - - name: init - run: | #配置git上传用户名、邮箱和安装npm包 - git config pull.rebase false - git config --local user.name "GitHub Actions" - git config --local user.email "actions@github.com" - cd ./utils/rm/ && npm ci - - name: subconverter #input./utils/clashcheck/check.yaml - run: ./utils/subconverter/subconverter -g --artifact "rm" #output./utils/subconverter/rm1 + - name: copy clashcheck to subconverter #input./utils/clashcheck/check.yaml + run: cp ./utils/clashcheck/check.yaml ./utils/subconverter/rm0 #output./utils/subconverter/rm0 + - name: subconverter #input./utils/subconverter/rm0 + run: ./utils/subconverter/subconverter -g --artifact "rm" && rm ./utils/subconverter/rm0 #delete./utils/subconverter/rm0 & output./utils/subconverter/rm1 + - name: move subconverter to Remove & Remark #input./utils/subconverter/rm1 + run: mv ./utils/subconverter/rm1 ./utils/rm/rm1 #output./utils/rm/rm1 - name: Remove & Remark - run: | #input./utils/subconverter/rm1 - mv ./utils/subconverter/rm1 ./utils/rm/rm1 + run: | #input./utils/rm/rm1 cd ./utils/rm/ #input./utils/rm/rm1 - base64 -d rm1 > rm2 #output./utils/rm/rm2 + base64 -d rm1 > rm2 #output./utils/rm/rm2 #input./utils/rm/rm2 - npm start #output./utils/rm/out - - name: url & https & check - run: | #input./utils/rm/url ./url ./.github/url.sh ./1 ./2 ./3 - rm ./utils/rm/rm1 ./utils/rm/rm2 #./utils/rm/out #./utils/rm/config.yml #清理垃圾 + npm start #output./utils/rm/out + - name: url & https + run: | #input./utils/rm/out ./url ./.github/url.sh ./1 ./2 ./3 + rm ./utils/rm/rm1 ./utils/rm/rm2 #delete./utils/rm/rm1 & ./utils/rm/rm2 #input./utils/rm/out - mv ./utils/rm/out ./url #output./url + mv ./utils/rm/out ./url #output./url #input./url - base64 ./url > ./utils/pool/check -w 0 #output./utils/pool/check + base64 ./url > ./utils/subconverter/check -w 0 #output./utils/subconverter/check #input./.github/url.sh - ./.github/url.sh > ./1 #output./1 + ./.github/url.sh > ./1 #output./1 #input./url - cp ./url ./2 #output./2 + cp ./url ./2 #output./2 #input./1 ./2 - cat 1 2 > 3 && rm 1 2 #output./3 + cat 1 2 > 3 && rm 1 2 #delete ./1 ./2 & output./3 #input./3 - base64 3 > https -w 0 && rm 3 #output./https - - run: ./.github/update-repo.sh || true #output./url ./https ./utils/pool/check - - et-job: #input./utils/pool/check ./utils/pool/pool - name: Encode & Translate - needs: rr-job - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 #git clone - - name: Timezone #UTC+0 → UTC+8 - run: sudo timedatectl set-timezone 'Asia/Shanghai' - - name: init - run: | - git config pull.rebase false - git config --local user.name "GitHub Actions" - git config --local user.email "actions@github.com" - - name: subconverter - run: | #input./utils/pool/check ./utils/pool/pool ./utils/clashcheck/check.yaml + base64 3 > https -w 0 && rm 3 #delete ./3 & output./https + - name: long & Clash.yaml + run: | #input./utils/pool/check ./utils/subconverter/subconverter -g #output./utils/subconverter/long ./utils/subconverter/Clash.yaml ./utils/subconverter/pool.yaml ./utils/subconverter/rm1 mv ./utils/subconverter/long ./long || true mv ./utils/subconverter/Clash.yaml ./Clash.yaml || true - rm ./utils/subconverter/pool.yaml ./utils/subconverter/rm1 - - run: ./.github/update-repo.sh || true #output./long ./Clash.yaml + rm ./utils/subconverter/check ./utils/subconverter/pool.yaml ./utils/subconverter/rm1 #delete ../check ../pool.yaml ../rm1 + - run: ./.github/update-repo.sh || true #output./url ./https ./long ./Clash.yaml ./utils/pool/output.yaml ./utils/clashcheck/input.yaml ./utils/clashcheck/check.yaml long: #jsdelivr CDN同步 - needs: et-job + needs: my-job runs-on: ubuntu-latest steps: - name: CDN run: curl https://purge.jsdelivr.net/gh/yu-steven/openit@main/long HTTPS: #jsdelivr CDN同步 - needs: et-job + needs: my-job runs-on: ubuntu-latest steps: - name: CDN run: curl https://purge.jsdelivr.net/gh/yu-steven/openit@main/https Clash: #jsdelivr CDN同步 - needs: et-job + needs: my-job runs-on: ubuntu-latest steps: - name: CDN run: curl https://purge.jsdelivr.net/gh/yu-steven/openit@main/Clash.yaml Quanx: #jsdelivr CDN同步 - needs: et-job + needs: my-job runs-on: ubuntu-latest steps: - name: CDN