This commit is contained in:
NianBroken
2024-03-06 15:14:07 +08:00 Unverified
parent 3ac771c82e
commit fe58e1d8f8
+1 -7
View File
@@ -31,7 +31,6 @@ jobs:
# 定义SyncFork的变量 # 定义SyncFork的变量
outputs: outputs:
MAIN_YML_FILES_INCONSISTENT: ${{ steps.compare_main_yml_files.outputs.MAIN_YML_FILES_INCONSISTENT }} MAIN_YML_FILES_INCONSISTENT: ${{ steps.compare_main_yml_files.outputs.MAIN_YML_FILES_INCONSISTENT }}
BEIJING_TIME: ${{ steps.run_main_program.outputs.BEIJING_TIME }}
steps: steps:
# 使用GitHub Actions提供的动作来检出代码库 # 使用GitHub Actions提供的动作来检出代码库
@@ -139,11 +138,9 @@ jobs:
pip install requests rsa pyquery pip install requests rsa pyquery
- name: Run main program - name: Run main program
id: run_main_program
env: env:
FORCE_PUSH_MESSAGE: ${{ github.event.inputs.force_push_message }} FORCE_PUSH_MESSAGE: ${{ github.event.inputs.force_push_message }}
MAIN_YML_FILES_INCONSISTENT: ${{ needs.SyncFork.outputs.MAIN_YML_FILES_INCONSISTENT }} MAIN_YML_FILES_INCONSISTENT: ${{ needs.SyncFork.outputs.MAIN_YML_FILES_INCONSISTENT }}
BEIJING_TIME: ${{ needs.CheckScores.outputs.BEIJING_TIME }}
URL: ${{ secrets.URL }} URL: ${{ secrets.URL }}
USERNAME: ${{ secrets.USERNAME }} USERNAME: ${{ secrets.USERNAME }}
PASSWORD: ${{ secrets.PASSWORD }} PASSWORD: ${{ secrets.PASSWORD }}
@@ -163,7 +160,7 @@ jobs:
else else
export FORCE_PUSH_MESSAGE="${{ github.event.inputs.force_push_message }}" export FORCE_PUSH_MESSAGE="${{ github.event.inputs.force_push_message }}"
fi fi
echo "BEIJING_TIME=$(TZ='Asia/Shanghai' date +'%Y-%m-%d %H:%M:%S:%3N')" >> $GITHUB_OUTPUT export BEIJING_TIME="$(TZ='Asia/Shanghai' date +'%Y-%m-%d %H:%M:%S:%3N')"
python main.py python main.py
echo "------" echo "------"
@@ -233,10 +230,7 @@ jobs:
uses: actions/checkout@main uses: actions/checkout@main
- name: Backup Main to ThirtyMinutesAgo - name: Backup Main to ThirtyMinutesAgo
env:
BEIJING_TIME: ${{ needs.CheckScores.outputs.BEIJING_TIME }}
run: | run: |
# 备份main分支到OldMain分支 # 备份main分支到OldMain分支
echo "BEIJING_TIME: $BEIJING_TIME"
git checkout -b OldMain|| git checkout OldMain git checkout -b OldMain|| git checkout OldMain
git push -f origin OldMain git push -f origin OldMain