Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/_build-apk-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ jobs:
if [ "$PRERELEASE" = "false" ]; then
VER_SUFFIX=""
elif [ '${{ inputs.build_type }}' = "release" ]; then
VER_SUFFIX="-preRelease-$SHA"
VER_SUFFIX="_preRelease-$SHA"
else
VER_SUFFIX="-preDebug-$SHA"
VER_SUFFIX="_preDebug-$SHA"
fi
echo "ver_suffix=$VER_SUFFIX" >> $GITHUB_OUTPUT

Expand Down Expand Up @@ -162,7 +162,7 @@ jobs:
SRC=$(find "$APK_OUTPUT_DIR" -name "app-${{ inputs.abi_type }}-${{ inputs.build_type }}.apk" | head -n 1)
[ -z "$SRC" ] && { echo "APK file not found (abi: ${{ inputs.abi_type }}, build: ${{ inputs.build_type }}) at path:$APK_OUTPUT_DIR"; exit 1; }
#SRC=${{ env.APK_OUTPUT_DIR }}${{ inputs.build_type }}/app-${{ inputs.abi_type }}-${{ inputs.build_type }}.apk
DST=${{ env.ARTIFACT_OUTPUT_DIR }}${{ inputs.abi_type }}/AndroIDE-${{ inputs.abi_type }}-${{ steps.params.outputs.ver_name }}${{ steps.params.outputs.ver_suffix }}.apk
DST=${{ env.ARTIFACT_OUTPUT_DIR }}${{ inputs.abi_type }}/AndroIDE_${{ inputs.abi_type }}_${{ steps.params.outputs.ver_name }}${{ steps.params.outputs.ver_suffix }}.apk
cp "$SRC" "$DST"
sha256sum "$DST" > "$DST.sha256"

Expand All @@ -173,7 +173,7 @@ jobs:
- name: Upload APK Artifact
uses: actions/upload-artifact@v4
with:
name: AndroIDE-${{ inputs.abi_type }}-${{ steps.params.outputs.ver_name }}${{ steps.params.outputs.ver_suffix }}
name: AndroIDE_${{ inputs.abi_type }}_${{ steps.params.outputs.ver_name }}${{ steps.params.outputs.ver_suffix }}
path: ${{ env.ARTIFACT_OUTPUT_DIR }}${{ inputs.abi_type }}/*

- name: Upload Mapping (release only)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
TITLE_SUFFIX=""
else
DATE=$(date +%Y%m%d)
TITLE_SUFFIX="-pre-${DATE}"
TITLE_SUFFIX="_pre-${DATE}"
fi
TITLE=$(echo "$CONTENT" | grep '^TITLE=' | cut -d= -f2- | sed 's/^[[:space:]]*//;s/[[:space:]]*$//' || true)
if [ -z "$TITLE" ]; then
Expand All @@ -81,7 +81,7 @@ jobs:
RAW_TAG="${{ steps.info.outputs.ver_name }}"
PRERELEASE="${{ steps.info.outputs.prerelease }}"
SHORT_SHA="${{ steps.sha.outputs.short_sha }}"
TAG_SUFFIX="-pre-${SHORT_SHA}"
TAG_SUFFIX="_pre-${SHORT_SHA}"
if [ "$PRERELEASE" = "false" ]; then
echo "final_tag=${RAW_TAG}" >> $GITHUB_OUTPUT
else
Expand Down
6 changes: 4 additions & 2 deletions RELEASE_INFO
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
## ---------------------------------------------------------------------------
## [Optional] [Only for release]
## ---------------------------------------------------------------------------
## Release title (default "VER_NAME -pre-$YYYYMMDD")
## Release title (default "VER_NAME _pre-$YYYYMMDD")
## ---------------------------------------------------------------------------
#TITLE=v2.7.1-beta3-pre-$YYYYMMDD
#TITLE=v2.7.1-beta3_pre-$YYYYMMDD


## ---------------------------------------------------------------------------
Expand Down Expand Up @@ -51,6 +51,7 @@ NOTES=
<details>
<summary><b>🇨🇳 中文版变更日志(点击展开)</b></summary>

- 将一个引起编译错误的依赖升级到可用版本
- 默认不开启统计数据收集
- ❗修复 首次启动时,手动安装SDK出现的GPG错误
- 优化GitHub工作流,更方便使用,效率更高
Expand All @@ -71,6 +72,7 @@ NOTES=
<details>
<summary><b>🌏 English Changelog (Click to expand)</b></summary>

- Fixed an error on one old version of the dependency
- Set "Stats collection" disabled as default
- ❗Fixed GPG errors when manually installing the SDK on first launch
- Optimized the GitHub workflow for greater convenience and efficiency
Expand Down
Loading