Skip to content

Commit

Permalink
Release v5.11.0-beta.2 (MaaAssistantArknights#11366)
Browse files Browse the repository at this point in the history
  • Loading branch information
ABA2396 authored Dec 15, 2024
2 parents 941c5be + 88673a2 commit c4f3a1c
Show file tree
Hide file tree
Showing 118 changed files with 14,134 additions and 724 deletions.
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ bc3ad67a02cb3b8e154c06955cf17091c4265000
# Do not add, remove or modify lines below this comment
# as they are automatically appended
# --------------------------------------------------- #
f7772bc814c52f9a5e65af02404cf54b70fe0a32
4 changes: 3 additions & 1 deletion .github/workflows/blame-ignore.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: Blame Ignore Commit
name: Git Blame Ignore

on:
schedule:
- cron: "45 21 * * *" # Runs daily at 22:00 UTC
workflow_dispatch:

jobs:
Expand Down
31 changes: 30 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ concurrency:

jobs:
meta:
# Prevent duplicate runs on organization branches with PRs
if: github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name !=
github.event.pull_request.base.repo.full_name

runs-on: ubuntu-latest
outputs:
tag: ${{ steps.set_tag.outputs.tag }}
Expand Down Expand Up @@ -93,6 +98,11 @@ jobs:
path: CHANGELOG.md

windows:
# Prevent duplicate runs on organization branches with PRs
if: github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name !=
github.event.pull_request.base.repo.full_name

needs: meta
strategy:
matrix:
Expand Down Expand Up @@ -183,6 +193,11 @@ jobs:
path: artifacts

ubuntu:
# Prevent duplicate runs on organization branches with PRs
if: github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name !=
github.event.pull_request.base.repo.full_name

needs: meta
runs-on: ubuntu-latest
strategy:
Expand Down Expand Up @@ -295,6 +310,11 @@ jobs:
release/*.tar.gz
macOS-Core:
# Prevent duplicate runs on organization branches with PRs
if: github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name !=
github.event.pull_request.base.repo.full_name

needs: meta
runs-on: macos-14
strategy:
Expand Down Expand Up @@ -333,6 +353,11 @@ jobs:
path: "install/*.dylib"

macOS-GUI:
# Prevent duplicate runs on organization branches with PRs
if: github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name !=
github.event.pull_request.base.repo.full_name

needs: [meta, macOS-Core]
runs-on: macos-14
steps:
Expand Down Expand Up @@ -466,7 +491,11 @@ jobs:
path: ${{ startsWith(github.ref, 'refs/tags/v') && 'release/MAA*' || 'src/MaaMacGui/MAA.xcarchive/**' }}

release:
if: startsWith(github.ref, 'refs/tags/v')
# Prevent duplicate runs on organization branches with PRs
if: (github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name !=
github.event.pull_request.base.repo.full_name) && startsWith(github.ref, 'refs/tags/v')

needs: [meta, windows, ubuntu, macOS-GUI]
runs-on: ubuntu-latest
steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/issue-checker.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: "Issue Checker"

on:
issues:
types: [opened, edited]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/markdown-checker.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: Check Dead Links

on:
schedule:
- cron: "0 0 * * 2" # Every Tuesday at 00:00 UTC
push:
branches:
- dev
Expand All @@ -15,8 +17,6 @@ on:
- "**/*.md"
- "docs/**"
- ".github/workflows/markdown-checker.yml"
schedule:
- cron: "44 7 * * 2" # Every Tuesday at 7:44 AM UTC
workflow_dispatch:

jobs:
Expand Down
20 changes: 19 additions & 1 deletion .github/workflows/optimize-templates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
optimize-png:
# Skip workflow to prevent double consecutive runs
# Skip workflow on PR merges
if: ${{ github.event.head_commit.author.email != '41898282+github-actions[bot]@users.noreply.github.com' && !github.event.pull_request }}
if: ${{ github.event.head_commit.author.email != '41898282+github-actions[bot]@users.noreply.github.com' }}
runs-on: ubuntu-latest
steps:
- name: Checkout repository
Expand All @@ -29,6 +29,24 @@ jobs:
show-progress: false
persist-credentials: false

- name: Check for direct push
id: check_push
run: |
pr_merge_status=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
"https://api.github.com/repos/${{ github.repository }}/commits/${{ github.event.after }}/pulls" | xargs)
if [[ "$pr_merge_status" == "[ ]" ]]; then
echo "Direct push detected. Proceeding..."
echo "is_pr=False" >> $GITHUB_OUTPUT
else
echo "PR merge detected. Exiting."
echo "is_pr=True" >> $GITHUB_OUTPUT
fi
- name: Add cancelled status
if: steps.check_push.outputs.is_pr == 'True'
uses: andymckay/[email protected]

- name: Setup python
uses: actions/setup-python@v5
with:
Expand Down
38 changes: 26 additions & 12 deletions .github/workflows/release-nightly-ota.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: release-nightly-ota

on:
schedule:
- cron: "0 22 * * *" # Runs daily at 22:00 UTC
workflow_dispatch:
inputs:
release_body:
Expand All @@ -11,15 +13,15 @@ on:
description: "Commit to build (git checkout)"
type: string
required: false
limit:
limit_maa:
description: "Number of releases to fetch from MaaAssistantArknights"
required: true
default: "30"
default: "10"
type: number
limit_2:
limit_mr:
description: "Number of releases to fetch from MaaRelease"
required: true
default: "30"
default: "10"
type: number

jobs:
Expand Down Expand Up @@ -47,6 +49,18 @@ jobs:
fetch-depth: 0
token: ${{ secrets.GITHUB_TOKEN }}

- name: Check for changes in dev branch
id: check_changes
run: |
if (git diff --quiet HEAD origin/${{ github.ref_name }}) {
echo "No changes in dev branch. Cancelling workflow."
echo "cancel_run=true" >> $GITHUB_ENV
}
- name: Stop if no changes
if: env.cancel_run == 'true'
uses: andymckay/[email protected]

- name: Checkout ref
run: |
if ("${{ inputs.ref }}" -ne "") {
Expand Down Expand Up @@ -217,16 +231,16 @@ jobs:
mkdir -pv build-ota && cd build-ota
# Convert inputs to integers
limit=${{ inputs.limit || 30 }}
limit=${limit%.*}
echo "Parsed limit: $limit"
limit_maa=${{ inputs.limit_maa || 10 }}
limit_maa=${limit_maa%.*}
echo "Parsed limit_maa: $limit_maa"
limit_2=${{ inputs.limit_2 || 30 }}
limit_2=${limit_2%.*}
echo "Parsed limit_2: $limit_2"
limit_mr=${{ inputs.limit_mr || 10 }}
limit_mr=${limit_mr%.*}
echo "Parsed limit_mr: $limit_mr"
gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit $limit | tee ./release_maa.txt
gh release list --repo "${{ github.repository_owner }}/MaaRelease" --limit $limit_2 | tee ./release_mr.txt
gh release list --repo 'MaaAssistantArknights/MaaAssistantArknights' --limit $limit_maa | tee ./release_maa.txt
gh release list --repo "${{ github.repository_owner }}/MaaRelease" --limit $limit_mr | tee ./release_mr.txt
echo ${{ needs.build-win-nightly.outputs.tag }} > ./config
cat ./release_maa.txt | awk '{ print $1 }' > ./tags_maa.txt
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/res-update-game.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: res-update-game

on:
schedule:
- cron: "*/20 * * * *"
- cron: "*/20 * * * *" # Runs every 20 minutes
workflow_dispatch:
inputs:
commit_message:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/smoke-testing.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: test
name: smoke-testing

on:
push:
Expand Down Expand Up @@ -31,6 +31,10 @@ concurrency:

jobs:
smoke-testing:
# Prevent duplicate runs on organization branches with PRs
if: github.event_name != 'pull_request' ||
github.event.pull_request.head.repo.full_name !=
github.event.pull_request.base.repo.full_name
runs-on: windows-latest
steps:
- name: Checkout code
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: "Inactive Issues auto close"

env: # config
daysBeforeStale: 90 # Number of days of inactivity before marking as stale
daysBeforeClose: 7 # Number of days to wait after marking as stale before closing
name: "Inactive Issues Closer"

on:
schedule:
- cron: "0 0 * * *" # Runs daily at UTC 00:00
workflow_dispatch: # Allows manual triggering

env: # config
daysBeforeStale: 90 # Number of days of inactivity before marking as stale
daysBeforeClose: 7 # Number of days to wait after marking as stale before closing

jobs:
stale:
runs-on: ubuntu-latest
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/sync-resource.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
name: sync-resource

on:
workflow_dispatch:
push:
branches:
- dev
paths:
- "resource/**"
- ".github/workflows/sync-resource.yml"
workflow_dispatch:

jobs:
sync-reource:
sync-resource:
if: github.repository_owner == 'MaaAssistantArknights'
runs-on: ubuntu-latest

steps:
Expand Down
2 changes: 1 addition & 1 deletion .last-checked-commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7521b526ee2a272d267ff9cb60651ab0e012b63f
3587b57a3a7a657de770231f6f0136d7ecf866f2
Loading

0 comments on commit c4f3a1c

Please sign in to comment.