Skip to content

Commit 038998c

Browse files
committed
update version rule.
1 parent 7c2eeee commit 038998c

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

.github/workflows/publish-github-release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ jobs:
1616
- name: Read Tag Version
1717
run: |
1818
# https://stackoverflow.com/questions/4916492/git-describe-fails-with-fatal-no-names-found-cannot-describe-anything
19-
# git describe --tags --always | awk -F . '{printf "RELEASE_VERSION=%s.%d",$1,$2+1}' | xargs echo > constants.env
20-
git describe --tags --always | awk -F - '{printf "RELEASE_VERSION=V1.0-%s",$NF}' | xargs echo > constants.env
19+
# git describe --tags --always | awk -F . '{printf "RELEASE_VERSION=%s.%d",$1,$2+1}' | xargs > constants.env
20+
# git describe --tags --always | awk -F - '{printf "RELEASE_VERSION=V1.0-%s",$NF}' | xargs > constants.env
21+
grep VERSION= download-pre.sh | awk -F = '{printf "RELEASE_VERSION=%s",$2}' | xargs > constants.env
2122
echo 'EDITION=github' >> constants.env
2223
cat constants.env
2324
- name: Export Env

.github/workflows/publish-ijk-release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ jobs:
1616
- name: Read Tag Version
1717
run: |
1818
# https://stackoverflow.com/questions/4916492/git-describe-fails-with-fatal-no-names-found-cannot-describe-anything
19-
# git describe --tags --always | awk -F . '{printf "RELEASE_VERSION=%s.%d",$1,$2+1}' | xargs echo > constants.env
20-
git describe --tags --always | awk -F - '{printf "RELEASE_VERSION=V1.0-%s",$NF}' | xargs echo > constants.env
19+
# git describe --tags --always | awk -F . '{printf "RELEASE_VERSION=%s.%d",$1,$2+1}' | xargs > constants.env
20+
# git describe --tags --always | awk -F - '{printf "RELEASE_VERSION=V1.0-%s",$NF}' | xargs > constants.env
21+
grep VERSION= download-pre.sh | awk -F = '{printf "RELEASE_VERSION=%s",$2}' | xargs > constants.env
2122
echo 'EDITION=ijk' >> constants.env
2223
cat constants.env
2324
- name: Export Env

download-pre.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# limitations under the License.
1616
#
1717

18+
VERSION=20221214184236
19+
1820
set -e
1921

2022
EDITION=$1
@@ -63,8 +65,9 @@ if [[ "$PLAT" != 'ios' && "$PLAT" != 'macos' && "$PLAT" != 'all' ]]; then
6365
fi
6466

6567
if test -z $VER ;then
66-
VER=$(git describe --abbrev=0 --tag | awk -F - '{printf "%s-%s",$1,$2}')
67-
echo "auto find the latest tag:${VER}"
68+
//VER=$(git describe --abbrev=0 --tag | awk -F - '{printf "%s-%s",$1,$2}')
69+
VER="$VERSION"
70+
echo "use the default version:${VER}"
6871
fi
6972

7073
if [[ "$PLAT" == 'ios' || "$PLAT" == 'macos' ]]; then

0 commit comments

Comments
 (0)