Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
80e2034
Merge pull request #693 from TitleCardMaker/staging
github-actions[bot] Apr 12, 2024
b281a48
Merge pull request #700 from TitleCardMaker/staging
github-actions[bot] Apr 14, 2024
7be19c7
Merge pull request #701 from TitleCardMaker/staging
github-actions[bot] Apr 15, 2024
8d92341
Merge pull request #702 from TitleCardMaker/staging
github-actions[bot] Apr 17, 2024
60f4ca3
Merge pull request #704 from TitleCardMaker/staging
github-actions[bot] Apr 18, 2024
2d99fc2
Merge pull request #707 from TitleCardMaker/staging
github-actions[bot] Apr 21, 2024
6ad6b48
Merge pull request #710 from TitleCardMaker/staging
github-actions[bot] Apr 23, 2024
5407916
Merge pull request #716 from TitleCardMaker/staging
github-actions[bot] Apr 24, 2024
87e0e31
Merge pull request #719 from TitleCardMaker/staging
github-actions[bot] Apr 25, 2024
36587c4
Merge pull request #721 from TitleCardMaker/staging
github-actions[bot] Apr 26, 2024
2601a5f
Merge pull request #727 from TitleCardMaker/staging
github-actions[bot] Apr 27, 2024
07f55e8
Merge pull request #737 from TitleCardMaker/staging
github-actions[bot] Apr 28, 2024
24d8f12
Merge pull request #738 from TitleCardMaker/staging
github-actions[bot] Apr 28, 2024
b835229
Merge pull request #740 from TitleCardMaker/staging
github-actions[bot] Apr 29, 2024
ae5fa7b
Merge pull request #744 from TitleCardMaker/staging
github-actions[bot] Apr 30, 2024
f7feac3
Merge pull request #748 from TitleCardMaker/staging
github-actions[bot] May 3, 2024
82be0f7
Merge pull request #751 from TitleCardMaker/staging
github-actions[bot] May 6, 2024
d441888
Merge pull request #755 from TitleCardMaker/staging
github-actions[bot] May 7, 2024
b1acc29
Merge pull request #758 from TitleCardMaker/staging
github-actions[bot] May 13, 2024
97c28da
Merge pull request #763 from TitleCardMaker/staging
github-actions[bot] May 14, 2024
4b063e6
Merge pull request #766 from TitleCardMaker/staging
github-actions[bot] May 15, 2024
1fd0596
Merge pull request #770 from TitleCardMaker/staging
github-actions[bot] May 16, 2024
5e0147e
Merge pull request #774 from TitleCardMaker/staging
github-actions[bot] May 19, 2024
1613f1a
Merge pull request #778 from TitleCardMaker/staging
github-actions[bot] May 23, 2024
24702cd
Merge pull request #779 from TitleCardMaker/staging
github-actions[bot] May 26, 2024
692352b
Merge pull request #784 from TitleCardMaker/staging
github-actions[bot] May 29, 2024
3c4fee9
Merge pull request #789 from TitleCardMaker/staging
github-actions[bot] Jun 4, 2024
49e6f89
Merge pull request #792 from TitleCardMaker/staging
github-actions[bot] Jun 7, 2024
b86c869
Merge pull request #795 from TitleCardMaker/staging
github-actions[bot] Jun 10, 2024
905bb03
Merge pull request #798 from TitleCardMaker/staging
github-actions[bot] Jun 12, 2024
b08eeb9
Merge pull request #799 from TitleCardMaker/staging
github-actions[bot] Jun 12, 2024
d7b0ed2
Merge pull request #806 from TitleCardMaker/staging
github-actions[bot] Jun 16, 2024
ad9364d
Merge pull request #808 from TitleCardMaker/staging
github-actions[bot] Jun 17, 2024
29c3e5c
[Auto] Merge Staging to Master [6/22/2024] (#809)
github-actions[bot] Jun 23, 2024
38b1f8a
Merge pull request #810 from TitleCardMaker/staging
github-actions[bot] Jun 23, 2024
01e9636
Merge pull request #814 from TitleCardMaker/staging
github-actions[bot] Jun 29, 2024
64c82ff
Merge pull request #819 from TitleCardMaker/staging
github-actions[bot] Jul 1, 2024
527b1a0
Bump certifi from 2024.2.2 to 2024.7.4 (#820)
dependabot[bot] Jul 14, 2024
69f06f2
Bump urllib3 from 2.2.1 to 2.2.2 (#821)
dependabot[bot] Jul 14, 2024
97ef7c5
Bump requests from 2.31.0 to 2.32.2 (#822)
dependabot[bot] Jul 14, 2024
a0fe994
Merge pull request #825 from TitleCardMaker/staging
github-actions[bot] Jul 14, 2024
7a1574a
Merge pull request #827 from TitleCardMaker/staging
github-actions[bot] Jul 16, 2024
c2df7eb
Merge pull request #831 from TitleCardMaker/staging
github-actions[bot] Jul 23, 2024
4ac5fb4
Merge pull request #833 from TitleCardMaker/staging
github-actions[bot] Jul 25, 2024
12d112c
Merge pull request #836 from TitleCardMaker/staging
github-actions[bot] Jul 25, 2024
ed486d6
Merge pull request #838 from TitleCardMaker/staging
github-actions[bot] Jul 26, 2024
47ddfb2
Merge pull request #839 from TitleCardMaker/staging
github-actions[bot] Jul 27, 2024
0e40955
Merge pull request #843 from TitleCardMaker/staging
github-actions[bot] Aug 5, 2024
04b9c2e
Merge pull request #845 from TitleCardMaker/staging
github-actions[bot] Aug 10, 2024
1cde123
Merge pull request #848 from TitleCardMaker/staging
github-actions[bot] Aug 20, 2024
af02ef4
Merge pull request #852 from TitleCardMaker/staging
github-actions[bot] Aug 26, 2024
919e60f
Merge pull request #855 from TitleCardMaker/staging
github-actions[bot] Aug 28, 2024
581e5da
Merge pull request #859 from TitleCardMaker/staging
github-actions[bot] Sep 3, 2024
67b189d
Merge pull request #864 from TitleCardMaker/staging
github-actions[bot] Sep 19, 2024
5e05c8a
Merge pull request #866 from TitleCardMaker/staging
github-actions[bot] Sep 19, 2024
2864216
Merge pull request #867 from TitleCardMaker/staging
github-actions[bot] Sep 19, 2024
3fd35b7
Merge pull request #871 from TitleCardMaker/staging
github-actions[bot] Sep 20, 2024
556b25b
Merge pull request #875 from TitleCardMaker/staging
github-actions[bot] Sep 21, 2024
9fcb4e0
Merge pull request #876 from TitleCardMaker/staging
github-actions[bot] Sep 23, 2024
94b2167
Merge pull request #879 from TitleCardMaker/staging
github-actions[bot] Sep 24, 2024
4cd937f
Merge pull request #883 from TitleCardMaker/staging
github-actions[bot] Sep 26, 2024
c40266b
Run merge workflow every 4 hours, not 2
CollinHeist Sep 26, 2024
e1b13fa
Merge pull request #904 from TitleCardMaker/staging
github-actions[bot] Oct 1, 2024
08a28ab
Merge pull request #909 from TitleCardMaker/staging
github-actions[bot] Oct 2, 2024
00acc82
Merge pull request #914 from TitleCardMaker/staging
github-actions[bot] Oct 2, 2024
65bb324
Merge pull request #915 from TitleCardMaker/staging
github-actions[bot] Oct 4, 2024
478fc78
Merge pull request #921 from TitleCardMaker/staging
github-actions[bot] Oct 8, 2024
d030880
Merge pull request #924 from TitleCardMaker/staging
github-actions[bot] Oct 16, 2024
35a03a4
Merge pull request #926 from TitleCardMaker/staging
github-actions[bot] Oct 20, 2024
1dece61
Merge pull request #928 from TitleCardMaker/staging
github-actions[bot] Oct 24, 2024
6699166
Merge pull request #932 from TitleCardMaker/staging
github-actions[bot] Oct 29, 2024
30f97f9
Merge pull request #934 from TitleCardMaker/staging
github-actions[bot] Nov 12, 2024
a8f575e
Merge pull request #937 from TitleCardMaker/staging
github-actions[bot] Nov 16, 2024
b139c71
Merge pull request #946 from TitleCardMaker/staging
github-actions[bot] Nov 26, 2024
f631ae0
Merge pull request #948 from TitleCardMaker/staging
github-actions[bot] Nov 30, 2024
d601b70
Merge pull request #949 from TitleCardMaker/staging
github-actions[bot] Nov 30, 2024
ab90232
Merge pull request #954 from TitleCardMaker/staging
github-actions[bot] Dec 5, 2024
f967afa
Merge pull request #957 from TitleCardMaker/staging
github-actions[bot] Dec 6, 2024
4ef35a8
Merge pull request #961 from TitleCardMaker/staging
github-actions[bot] Dec 12, 2024
bbd6ed1
[Auto] Merge Staging to Master [12/15/2024] (#969)
github-actions[bot] Dec 15, 2024
407feb6
Merge pull request #970 from TitleCardMaker/staging
github-actions[bot] Dec 15, 2024
d74a456
Merge pull request #976 from TitleCardMaker/staging
github-actions[bot] Dec 17, 2024
b5e8990
Merge pull request #979 from TitleCardMaker/staging
github-actions[bot] Dec 20, 2024
e0951d8
Merge pull request #981 from TitleCardMaker/staging
github-actions[bot] Dec 25, 2024
0b56178
Merge pull request #983 from TitleCardMaker/staging
github-actions[bot] Jan 5, 2025
6b0d2bc
Merge pull request #985 from TitleCardMaker/staging
github-actions[bot] Jan 8, 2025
e20d299
Merge pull request #986 from TitleCardMaker/staging
github-actions[bot] Jan 10, 2025
e01702e
Merge pull request #987 from TitleCardMaker/staging
github-actions[bot] Jan 16, 2025
daa211f
Merge pull request #992 from TitleCardMaker/staging
github-actions[bot] Jan 28, 2025
539f8a3
Merge pull request #994 from TitleCardMaker/staging
github-actions[bot] Feb 2, 2025
2d456fd
Merge pull request #996 from TitleCardMaker/staging
github-actions[bot] Feb 7, 2025
ba2c66a
Merge pull request #1002 from TitleCardMaker/staging
github-actions[bot] Feb 10, 2025
a650bb1
Use SHA-tagged request-action workflow versions
CollinHeist Feb 11, 2025
72800e6
Update auto_merge_staging.yml
CollinHeist Feb 11, 2025
3aefe3d
Merge pull request #1005 from TitleCardMaker/staging
github-actions[bot] Feb 21, 2025
4e1af86
Merge pull request #1006 from TitleCardMaker/staging
github-actions[bot] Feb 21, 2025
88cf392
Merge pull request #1009 from TitleCardMaker/staging
github-actions[bot] Feb 25, 2025
3563a9d
Merge pull request #1015 from TitleCardMaker/staging
github-actions[bot] Feb 28, 2025
a8798b2
Merge pull request #1016 from TitleCardMaker/staging
github-actions[bot] Mar 1, 2025
5bb9c38
Add new season images
MrSaiclops Mar 9, 2025
f5ac41c
Update blueprint.json with new source files
MrSaiclops Mar 9, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 5 additions & 63 deletions .github/workflows/auto_merge_staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Merge Staging to Master
on:
workflow_dispatch:
schedule:
- cron: "0 */2 * * *"
- cron: "0 */4 * * *"

jobs:
create-pull-request:
Expand All @@ -19,7 +19,7 @@ jobs:
# Get list of open issues that are labeled as "created"
- name: Get Open Issues
id: get_issues
uses: octokit/request-action@v2.1.9
uses: octokit/request-action@dad4362715b7fb2ddedf9772c8670824af564f0d
with:
route: GET /repos/${{ github.repository }}/issues?labels=created,passed-tests&state=open
env:
Expand Down Expand Up @@ -51,14 +51,9 @@ jobs:
}
}

# call-resize-images-workflow:
# needs: create-pull-request
# if: ${{ needs.create-pull-request.outputs.pr_number != 'NA' }}
# uses: TitleCardMaker/Blueprints/.github/workflows/resize_images.yml@master
# secrets: inherit

update-artifacts-and-notify-discord:
needs: create-pull-request
if: ${{ needs.create-pull-request.outputs.pr_number != 'NA' }}
runs-on: ubuntu-latest

steps:
Expand Down Expand Up @@ -109,7 +104,7 @@ jobs:
# Get list of open issues that are labeled as "created"
- name: Get Open Issues
id: get_issues
uses: octokit/request-action@v2.x
uses: octokit/request-action@dad4362715b7fb2ddedf9772c8670824af564f0d
with:
route: GET /repos/${{ github.repository }}/issues?labels=created,passed-tests,blueprint&state=open
env:
Expand All @@ -123,67 +118,14 @@ jobs:
run: |
python entrypoint.py --notify-discord

# call-update-database-workflow:
# needs: [call-resize-images-workflow]
# if: ${{ needs.create-pull-request.outputs.pr_number != 'NA' }}
# uses: TitleCardMaker/Blueprints/.github/workflows/update_database.yml@master
# secrets: inherit

# call-pytest-workflow:
# needs: [call-update-database-workflow]
# if: ${{ needs.create-pull-request.outputs.pr_number != 'NA' }}
# uses: TitleCardMaker/Blueprints/.github/workflows/pytest.yml@master

# notify-discord:
# # needs: [call-pytest-workflow]
# if: ${{ needs.create-pull-request.outputs.pr_number != 'NA' }}
# runs-on: ubuntu-latest

# steps:
# # Get list of open issues that are labeled as "created"
# - name: Get Open Issues
# id: get_issues
# uses: octokit/request-action@v2.x
# with:
# route: GET /repos/${{ github.repository }}/issues?labels=created,passed-tests,blueprint&state=open
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# # Check out repository
# - name: Checkout Repository
# uses: actions/checkout@v3
# with:
# ref: refs/heads/staging
# persist-credentials: false
# fetch-depth: 0

# # Run script to parse issue
# - name: Set up Python
# uses: actions/setup-python@v5
# with:
# python-version: '3.11'
# cache: 'pip'

# - name: Install dependencies
# run: |
# python -m pip install -r requirements.txt

# - name: Send Discord Message
# env:
# DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
# DISCORD_AVATAR: https://raw.githubusercontent.com/CollinHeist/static/main/logo.png
# ISSUES: ${{ steps.get_issues.outputs.data }}
# run: |
# python entrypoint.py --notify-discord

merge-pull-request:
# needs: [create-pull-request, call-resize-images-workflow, call-update-database-workflow, call-pytest-workflow, notify-discord]
needs: [create-pull-request, update-artifacts-and-notify-discord]
if: ${{ needs.create-pull-request.outputs.pr_number != 'NA' }}
runs-on: ubuntu-latest
steps:
- name: Merge Pull Request
uses: octokit/request-action@v2.x
uses: octokit/request-action@dad4362715b7fb2ddedf9772c8670824af564f0d
with:
route: PUT /repos/${{ github.repository }}/pulls/${{ needs.create-pull-request.outputs.pr_number }}/merge
token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pydantic = "==1.10.17"
discord-webhook = "==1.3.1"
sqlalchemy = "==2.0.31"
urllib3 = "==2.2.2"
requests = "==2.32.3"
requests = "==2.32.2"

[dev-packages]
alembic = "==1.13.1"
Expand Down
14 changes: 7 additions & 7 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion blueprints/S/Survivor (2000)/0/blueprint.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@
"logo_season33.webp",
"logo_season11.webp",
"logo_season7.webp",
"logo_season47.webp",
"logo_season48.webp",
"logo_season37.webp",
"logo_season2.webp",
"logo_season39.webp",
Expand Down Expand Up @@ -168,4 +170,4 @@
"preview2.jpg"
],
"created": "2024-03-30T03:44:07"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 12 additions & 12 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
-i https://pypi.org/simple
certifi==2024.2.2; python_version >= '3.6'
certifi==2024.7.4; python_version >= '3.6'
charset-normalizer==3.3.2; python_full_version >= '3.7.0'
discord-webhook==1.3.0; python_version >= '3.8' and python_version < '4.0'
idna==3.6; python_version >= '3.5'
discord-webhook==1.3.1; python_version >= '3.10' and python_version < '4.0'
idna==3.7; python_version >= '3.5'
imagesize==1.4.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
iniconfig==2.0.0; python_version >= '3.7'
packaging==24.0; python_version >= '3.7'
pillow==10.3.0; python_version >= '3.8'
pluggy==1.4.0; python_version >= '3.8'
pydantic==1.10.14; python_version >= '3.7'
packaging==24.1; python_version >= '3.8'
pillow==10.4.0; python_version >= '3.8'
pluggy==1.5.0; python_version >= '3.8'
pydantic==1.10.17; python_version >= '3.7'
pytest==7.4.3; python_version >= '3.7'
regex==2023.10.3; python_version >= '3.7'
requests==2.31.0; python_version >= '3.7'
sqlalchemy==2.0.23; python_version >= '3.7'
typing-extensions==4.10.0; python_version >= '3.8'
urllib3==2.2.1; python_version >= '3.8'
regex==2024.5.15; python_version >= '3.8'
requests==2.32.2; python_version >= '3.8'
sqlalchemy==2.0.31; python_version >= '3.7'
typing-extensions==4.12.2; python_version >= '3.8'
urllib3==2.2.2; python_version >= '3.8'