Skip to content
This repository was archived by the owner on Mar 5, 2023. It is now read-only.

Commit c6f510f

Browse files
committed
Fix android build upload
1 parent 3ac9716 commit c6f510f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/github.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- name: Update VCMI Sources
2929
run: |
30-
git submodule update --init --recursive ${{github.workspace}}/ext/vcmi
30+
git submodule update --init --remote --recursive ${{github.workspace}}/ext/vcmi
3131
3232
- name: Dependencies
3333
run: |

project/vcmi-app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def ResolveGitInfo() {
157157
}
158158
ext.gitInfoLauncher = CommandOutput("git", ["describe", "--match=", "--always", "--abbrev=7"], PROJECT_PATH_BASE)
159159
ext.gitInfoVcmi =
160-
CommandOutput("git", ["rev-parse", "--abbrev-ref", "HEAD"], PROJECT_PATH_BASE + "/ext/vcmi").replaceAll("[^a-zA-Z0-9\\-_]", "_") +
160+
CommandOutput("git", ["log", "-1", "--pretty=%D", "--decorate-refs=refs/remotes/origin/*"], PROJECT_PATH_BASE + "/ext/vcmi").replace("origin/", "").replace(", HEAD", "").replaceAll("[^a-zA-Z0-9\\-_]", "_") +
161161
"-" +
162162
CommandOutput("git", ["describe", "--match=", "--always", "--abbrev=7"], PROJECT_PATH_BASE + "/ext/vcmi")
163163
}

0 commit comments

Comments
 (0)