rainerosion/genshin-impact-helper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update main.yml

Browse Source
This commit is contained in:
Celeter 2020-12-29 17:00:18 +08:00 committed by GitHub
parent 58d0a5a2a9
commit 138418dd8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/main.yml vendored
View File

@ -20,6 +20,15 @@ jobs:
with: with:
ref: master ref: master
- name: Merge From y1ndan/genshin-impact-helper
if: ${{ env.ALLOW_MERGE != 'false' }}
run: |
git config --global user.name github-actions
git config --global user.email github-actions@github.com
git remote add upstream https://github.com/y1ndan/genshin-impact-helper
git pull upstream master --allow-unrelated-histories
git push origin master
- name: Set up python - name: Set up python
uses: actions/setup-python@v2 uses: actions/setup-python@v2
with: with:
@ -29,11 +38,4 @@ jobs:
run: | run: |
pip install -r requirements.txt pip install -r requirements.txt
echo "${{ secrets.COOKIE }}" | tr '#' "\n" | sed 's/$/&#${{ secrets.SCKEY }}/g' | xargs -I {} sh -c 'echo "{}" | python3 ./genshin.py' echo "${{ secrets.COOKIE }}" | tr '#' "\n" | sed 's/$/&#${{ secrets.SCKEY }}/g' | xargs -I {} sh -c 'echo "{}" | python3 ./genshin.py'
- name: Merge From y1ndan/genshin-impact-helper
if: ${{ env.ALLOW_MERGE != 'false' }}
run: |
git config --global user.name github-actions
git config --global user.email github-actions@github.com
git remote add upstream https://github.com/y1ndan/genshin-impact-helper
git pull upstream master --allow-unrelated-histories
git push origin master