Compare commits
2 Commits
v1.2.0
...
gri-advice
Author | SHA1 | Date | |
---|---|---|---|
d55cc77e05
|
|||
6344c3b3e3
|
72
.github/workflows/mega-linter.yml
vendored
72
.github/workflows/mega-linter.yml
vendored
@ -6,12 +6,14 @@ permissions: read-all
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [master]
|
branches:
|
||||||
|
- master
|
||||||
|
|
||||||
env:
|
env:
|
||||||
APPLY_FIXES: none
|
APPLY_FIXES: none
|
||||||
APPLY_FIXES_EVENT: pull_request
|
APPLY_FIXES_EVENT: pull_request
|
||||||
APPLY_FIXES_MODE: commit
|
APPLY_FIXES_MODE: commit
|
||||||
|
FILTER_REGEX_EXCLUDE: (mega-linter.yml)
|
||||||
DISABLE: SPELL
|
DISABLE: SPELL
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
@ -19,54 +21,94 @@ concurrency:
|
|||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
megalinter:
|
||||||
name: MegaLinter
|
name: MegaLinter
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
issues: write
|
||||||
|
pull-requests: write
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Code
|
- name: Checkout Code
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
|
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: MegaLinter
|
- name: MegaLinter
|
||||||
|
uses: oxsecurity/megalinter@7e042c726c68415475b05a65a686c612120a1232
|
||||||
id: ml
|
id: ml
|
||||||
uses: oxsecurity/megalinter@v7
|
|
||||||
env:
|
env:
|
||||||
VALIDATE_ALL_CODEBASE: true
|
VALIDATE_ALL_CODEBASE: true
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Archive production artifacts
|
- name: Archive production artifacts
|
||||||
if: ${{ success() }} || ${{ failure() }}
|
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
|
||||||
uses: actions/upload-artifact@v3
|
if: success() || failure()
|
||||||
with:
|
with:
|
||||||
name: MegaLinter reports
|
name: MegaLinter reports
|
||||||
path: |
|
path: |
|
||||||
megalinter-reports
|
megalinter-reports
|
||||||
mega-linter.log
|
mega-linter.log
|
||||||
|
|
||||||
|
- name: Set APPLY_FIXES_IF var
|
||||||
|
run: |
|
||||||
|
printf 'APPLY_FIXES_IF=%s\n' "${{
|
||||||
|
steps.ml.outputs.has_updated_sources == 1 &&
|
||||||
|
(
|
||||||
|
env.APPLY_FIXES_EVENT == 'all' ||
|
||||||
|
env.APPLY_FIXES_EVENT == github.event_name
|
||||||
|
) &&
|
||||||
|
(
|
||||||
|
github.event_name == 'push' ||
|
||||||
|
github.event.pull_request.head.repo.full_name == github.repository
|
||||||
|
)
|
||||||
|
}}" >> "${GITHUB_ENV}"
|
||||||
|
|
||||||
|
- name: Set APPLY_FIXES_IF_* vars
|
||||||
|
run: |
|
||||||
|
printf 'APPLY_FIXES_IF_PR=%s\n' "${{
|
||||||
|
env.APPLY_FIXES_IF == 'true' &&
|
||||||
|
env.APPLY_FIXES_MODE == 'pull_request'
|
||||||
|
}}" >> "${GITHUB_ENV}"
|
||||||
|
printf 'APPLY_FIXES_IF_COMMIT=%s\n' "${{
|
||||||
|
env.APPLY_FIXES_IF == 'true' &&
|
||||||
|
env.APPLY_FIXES_MODE == 'commit' &&
|
||||||
|
(!contains(fromJSON('["refs/heads/main", "refs/heads/master"]'), github.ref))
|
||||||
|
}}" >> "${GITHUB_ENV}"
|
||||||
|
|
||||||
- name: Create Pull Request with applied fixes
|
- name: Create Pull Request with applied fixes
|
||||||
|
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
|
||||||
id: cpr
|
id: cpr
|
||||||
if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'pull_request' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
|
if: env.APPLY_FIXES_IF_PR == 'true'
|
||||||
uses: peter-evans/create-pull-request@v5
|
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
|
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
|
||||||
commit-message: "[MegaLinter] Apply linters automatic fixes"
|
commit-message: "[MegaLinter] Apply linters automatic fixes"
|
||||||
title: "[MegaLinter] Apply linters automatic fixes"
|
title: "[MegaLinter] Apply linters automatic fixes"
|
||||||
labels: bot
|
labels: bot
|
||||||
|
|
||||||
- name: Create PR output
|
- name: Create PR output
|
||||||
if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'pull_request' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
|
if: env.APPLY_FIXES_IF_PR == 'true'
|
||||||
run: |
|
run: |
|
||||||
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
|
echo "PR Number - ${{ steps.cpr.outputs.pull-request-number }}"
|
||||||
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
|
echo "PR URL - ${{ steps.cpr.outputs.pull-request-url }}"
|
||||||
|
|
||||||
- name: Prepare commit
|
- name: Prepare commit
|
||||||
if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
|
if: env.APPLY_FIXES_IF_COMMIT == 'true'
|
||||||
run: sudo chown -Rc $UID .git/
|
run: sudo chown -Rc $UID .git/
|
||||||
|
|
||||||
- name: Commit and push applied linter fixes
|
- name: Commit and push applied linter fixes
|
||||||
if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
|
uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d
|
||||||
uses: stefanzweifel/git-auto-commit-action@v4
|
if: env.APPLY_FIXES_IF_COMMIT == 'true'
|
||||||
with:
|
with:
|
||||||
branch: ${{ github.event.pull_request.head.ref || github.head_ref || github.ref }}
|
branch: >-
|
||||||
|
${{
|
||||||
|
github.event.pull_request.head.ref ||
|
||||||
|
github.head_ref ||
|
||||||
|
github.ref
|
||||||
|
}}
|
||||||
commit_message: "[MegaLinter] Apply linters fixes"
|
commit_message: "[MegaLinter] Apply linters fixes"
|
||||||
commit_user_name: "github-actions"
|
commit_user_name: "github-actions"
|
||||||
commit_user_email: "github-actions[bot]@users.noreply.github.com"
|
commit_user_email: "github-actions[bot]@users.noreply.github.com"
|
||||||
|
@ -13,6 +13,12 @@ var private localized String IncompatibleGRI;
|
|||||||
var const String IncompatibleGRIWarningDefault;
|
var const String IncompatibleGRIWarningDefault;
|
||||||
var private localized String IncompatibleGRIWarning;
|
var private localized String IncompatibleGRIWarning;
|
||||||
|
|
||||||
|
var const String NoneGRIDefault;
|
||||||
|
var private localized String NoneGRI;
|
||||||
|
|
||||||
|
var const String NoneGRIWarningDefault;
|
||||||
|
var private localized String NoneGRIWarning;
|
||||||
|
|
||||||
var const String SecondsShortDefault;
|
var const String SecondsShortDefault;
|
||||||
var private localized String SecondsShort;
|
var private localized String SecondsShort;
|
||||||
|
|
||||||
@ -25,6 +31,8 @@ enum E_LTI_LocalMessageType
|
|||||||
LTI_WaitingGRI,
|
LTI_WaitingGRI,
|
||||||
LTI_IncompatibleGRI,
|
LTI_IncompatibleGRI,
|
||||||
LTI_IncompatibleGRIWarning,
|
LTI_IncompatibleGRIWarning,
|
||||||
|
LTI_NoneGRI,
|
||||||
|
LTI_NoneGRIWarning,
|
||||||
LTI_SecondsShort,
|
LTI_SecondsShort,
|
||||||
LTI_PleaseWait
|
LTI_PleaseWait
|
||||||
};
|
};
|
||||||
@ -52,6 +60,12 @@ public static function String GetLocalizedString(
|
|||||||
case LTI_IncompatibleGRIWarning:
|
case LTI_IncompatibleGRIWarning:
|
||||||
return (default.IncompatibleGRIWarning != "" ? default.IncompatibleGRIWarning : default.IncompatibleGRIWarningDefault);
|
return (default.IncompatibleGRIWarning != "" ? default.IncompatibleGRIWarning : default.IncompatibleGRIWarningDefault);
|
||||||
|
|
||||||
|
case LTI_NoneGRI:
|
||||||
|
return (default.NoneGRI != "" ? default.NoneGRI : default.NoneGRIDefault);
|
||||||
|
|
||||||
|
case LTI_NoneGRIWarning:
|
||||||
|
return (default.NoneGRIWarning != "" ? default.NoneGRIWarning : default.NoneGRIWarningDefault);
|
||||||
|
|
||||||
case LTI_SecondsShort:
|
case LTI_SecondsShort:
|
||||||
return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault);
|
return (default.SecondsShort != "" ? default.SecondsShort : default.SecondsShortDefault);
|
||||||
|
|
||||||
@ -68,6 +82,8 @@ defaultproperties
|
|||||||
WaitingGRIDefault = "Waiting GRI..."
|
WaitingGRIDefault = "Waiting GRI..."
|
||||||
IncompatibleGRIDefault = "Incompatible GRI:"
|
IncompatibleGRIDefault = "Incompatible GRI:"
|
||||||
IncompatibleGRIWarningDefault = "You can enter the game, but the trader may not work correctly.";
|
IncompatibleGRIWarningDefault = "You can enter the game, but the trader may not work correctly.";
|
||||||
|
NoneGRIDefault = "GRI is not initialized!"
|
||||||
|
NoneGRIWarningDefault = "It is recommended to reconnect. If you enter the game right now, the trader may not work correctly.";
|
||||||
SecondsShortDefault = "s"
|
SecondsShortDefault = "s"
|
||||||
PleaseWaitDefault = "Please wait"
|
PleaseWaitDefault = "Please wait"
|
||||||
}
|
}
|
@ -150,8 +150,15 @@ private simulated function Finished()
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
`Log_Error("Incompatible Replication info:" @ String(GRI));
|
`Log_Error("Incompatible Game Replication info:" @ String(GRI));
|
||||||
NotifyIncompatibleGRI();
|
if (GRI == None)
|
||||||
|
{
|
||||||
|
NotifyNoneGRI();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
NotifyIncompatibleGRI();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ShowReadyButton();
|
ShowReadyButton();
|
||||||
@ -308,6 +315,7 @@ private simulated function KeepNotification()
|
|||||||
|
|
||||||
private simulated function ClientCleanup()
|
private simulated function ClientCleanup()
|
||||||
{
|
{
|
||||||
|
`Log_Debug("Cleanup");
|
||||||
ServerCleanup();
|
ServerCleanup();
|
||||||
SafeDestroy();
|
SafeDestroy();
|
||||||
}
|
}
|
||||||
@ -363,6 +371,16 @@ private simulated function NotifyIncompatibleGRI()
|
|||||||
class'KFLocalMessage'.default.InteractionColor);
|
class'KFLocalMessage'.default.InteractionColor);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private simulated function NotifyNoneGRI()
|
||||||
|
{
|
||||||
|
WriteToChatLocalized(
|
||||||
|
LTI_NoneGRI,
|
||||||
|
class'KFLocalMessage'.default.InteractionColor);
|
||||||
|
WriteToChatLocalized(
|
||||||
|
LTI_NoneGRIWarning,
|
||||||
|
class'KFLocalMessage'.default.InteractionColor);
|
||||||
|
}
|
||||||
|
|
||||||
defaultproperties
|
defaultproperties
|
||||||
{
|
{
|
||||||
bAlwaysRelevant = false
|
bAlwaysRelevant = false
|
||||||
|
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user