Skip to content

Commit

Permalink
Merge pull request #5568 from planetarium/release/210.0.4
Browse files Browse the repository at this point in the history
merge `release/210.0.4` to `main`
  • Loading branch information
tyrosine1153 authored Jul 29, 2024
2 parents 9077ae0 + 787f089 commit 3c630c9
Show file tree
Hide file tree
Showing 1,832 changed files with 123,366 additions and 44,698 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.so filter=lfs diff=
nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.so filter=lfs diff=lfs merge=lfs -text
nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppAnalytics.bundle filter=lfs diff=lfs merge=lfs -text
nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-11_3_0.bundle filter=lfs diff=lfs merge=lfs -text
nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-12_1_0.bundle filter=lfs diff=lfs merge=lfs -text
nekoyume/Assets/Firebase/Plugins/x86_64/FirebaseCppApp-12_1_0.so filter=lfs diff=lfs merge=lfs -text

42 changes: 42 additions & 0 deletions .github/workflows/9c-projects.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: set 9c project default fields
on:
issues:
types:
- opened
- reopened
pull_request:
types:
- opened
- reopened

jobs:
add-to-project:
name: Add To GitHub projects
runs-on: ubuntu-latest
steps:
- name: Add project
uses: actions/[email protected]
with:
project-url: https://github.com/orgs/planetarium/projects/97
github-token: ${{ secrets.PROJECTS_PAT }}
- name: Set milestone env
run: |
echo "CURRENT_MILESTONE=$(gh api graphql -f query='query($name: String!, $owner: String!) {
repository(name: $name, owner: $owner) {
name
milestones(last: 1, states: [OPEN], orderBy: {field: DUE_DATE, direction: DESC}) {
nodes {
number
state
title
dueOn
}
}
}}' -f name=NineChronicles -f owner=planetarium --jq '.data.repository.milestones.nodes.[0].title')" >> $GITHUB_ENV
env:
GH_TOKEN: ${{ secrets.PROJECTS_PAT }}
- name: Set milestone field
uses: Julexar/[email protected]
with:
token: "${{ secrets.GITHUB_TOKEN }}"
milestone: "${{ env.CURRENT_MILESTONE }}"
6 changes: 1 addition & 5 deletions .github/workflows/android-build-and-release-for-9ck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,6 @@ jobs:
run: |
echo "${{ secrets.GOOGLE_SERVICES_JSON_K }}" | base64 -d > ${{ matrix.projectPath }}/Assets/NineChronicles/GoogleServices/google-services.json
- name: Resolve AAR files
run: |
sudo \cp -R ${{ matrix.projectPath }}/ResolvedAAR/. ${{ matrix.projectPath }}/Assets/Plugins/Android/
- name: Change cloudProjectId in ProjectSettings.asset
run: |
sed -i '/cloudProjectId/c\ cloudProjectId: fa57c419-1189-418d-951c-055e5f9738d0' ${{ matrix.projectPath }}/ProjectSettings/ProjectSettings.asset
Expand All @@ -111,7 +107,7 @@ jobs:
buildName: ${{ matrix.targetPlatform }}
androidVersionCode: ${{ github.event.inputs.version-code }}
version: ${{ github.event.inputs.app-version }}
androidTargetSdkVersion: AndroidApiLevel33
androidTargetSdkVersion: AndroidApiLevel34
customParameters: -identifier com.planetariumlabs.ninechroniclesmobilek -playerName Nine-Chronicles-K
allowDirtyBuild: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-build-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ jobs:
buildName: ${{ matrix.targetPlatform }}
androidVersionCode: ${{ github.event.inputs.version-code }}
version: ${{ github.event.inputs.app-version }}
androidTargetSdkVersion: AndroidApiLevel33
androidTargetSdkVersion: AndroidApiLevel34
customParameters: -identifier ${{ github.event.inputs.package-name }} -playerName ${{ github.event.inputs.player-name }}
allowDirtyBuild: true

Expand Down
1 change: 1 addition & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[submodule "nekoyume/Assets/_Scripts/Lib9c/lib9c"]
path = nekoyume/Assets/_Scripts/Lib9c/lib9c
url = https://github.com/planetarium/lib9c.git
fetchRecurseSubmodules = no
[submodule "nekoyume/Assets/_Scripts/NineChronicles.RPC.Shared"]
path = nekoyume/Assets/_Scripts/NineChronicles.RPC.Shared
url = https://github.com/planetarium/NineChronicles.RPC.Shared.git

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

Loading

0 comments on commit 3c630c9

Please sign in to comment.