Skip to content

Commit f5cfbc8

Browse files
authored
Do not check out tag in android-release.yml (#3480)
1 parent b585b00 commit f5cfbc8

File tree

3 files changed

+3
-36
lines changed

3 files changed

+3
-36
lines changed

.github/scripts/validate-version.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
validate_version() {
44
local version="$1"
55
if [[ ! "$version" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-pre.*)?$ ]]; then
6-
echo "::error::Invalid version format in VERSION file. Expected: X.Y.Z or X.Y.Z-pre*"
6+
echo "::error::Invalid version '$version' in $(realpath VERSION). Expected: X.Y.Z or X.Y.Z-pre*"
77
return 1
88
fi
99
return 0
1010
}
1111

1212
version=$(cat VERSION 2>/dev/null)
1313
if [ -z "$version" ]; then
14-
echo "::error::VERSION file not found or empty"
14+
echo "::error::No VERSION file found or empty in $PWD"
1515
exit 1
1616
fi
1717

.github/workflows/android-release.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,14 @@ jobs:
3030
cmakeVersion: 3.24.1
3131
ninjaVersion: latest
3232

33-
- name: Ensure source code revision
34-
run: scripts/ensure-code-revision.sh
35-
working-directory: platform/android
36-
shell: bash
37-
3833
- name: npm install
3934
run: npm install --ignore-scripts
40-
working-directory: platform/android
4135

4236
- name: Android nitpick
4337
run: make run-android-nitpick
4438

4539
- name: Validate and set version
46-
working-directory: platform/android
47-
run: |
48-
../../.github/scripts/validate-version.sh
40+
run: ../../.github/scripts/validate-version.sh
4941

5042
- name: Build package
5143
run: |

platform/android/scripts/ensure-code-revision.sh

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)