80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Jenkins: Populate AppImage version with data from generated version.h

Browse Source
This commit is contained in:
RichardG867
2022-02-13 15:15:40 -03:00
parent c1b071bee5
commit a6ac053960
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/AppImageBuilder.yml
View File

@@ -21,7 +21,7 @@ AppDir:
id: !ENV 'net.${project_lower}.${project_lower}' id: !ENV 'net.${project_lower}.${project_lower}'
name: !ENV '${project}' name: !ENV '${project}'
icon: !ENV '${project_lower}' icon: !ENV '${project_lower}'
version: '3.2' version: !ENV '${project_version}'
exec: !ENV 'usr/local/bin/${project}' exec: !ENV 'usr/local/bin/${project}'
exec_args: $@ exec_args: $@
apt: apt:
@@ -40,6 +40,7 @@ AppDir:
- libevdev2 - libevdev2
- libgbm1 - libgbm1
- libgles2 - libgles2
- libglvnd0
- libopenal-data=1:1.17* - libopenal-data=1:1.17*
- libopenal1=1:1.17* - libopenal1=1:1.17*
- libpng16-16 - libpng16-16
@@ -57,7 +58,6 @@ AppDir:
- libxcb-shm0 - libxcb-shm0
- libxcb-xfixes0 - libxcb-xfixes0
- libxcb1 - libxcb1
- zlib1g
files: files:
exclude: exclude:
- etc - etc

8
.ci/build.sh
View File

@@ -470,6 +470,12 @@ else
*) arch_appimage="$arch";; *) arch_appimage="$arch";;
esac esac
# Get version for AppImage metadata.
project_version=$(grep -oP '#define\s+EMU_VERSION\s+"\K([^"]+)' "build/src/include/$project_lower/version.h" 2>/dev/null)
[ -z "$project_version" ] && project_version=unknown
build_num=$(grep -oP '#define\s+EMU_BUILD_NUM\s+\K([0-9]+)' "build/src/include/$project_lower/version.h" 2>/dev/null)
[ ! -z "$build_num" -a "$build_num" != "0" ] && project_version="$project_version-b$build_num"
# Download appimage-builder if necessary. # Download appimage-builder if necessary.
[ ! -e "appimage-builder.AppImage" ] && wget -qO appimage-builder.AppImage \ [ ! -e "appimage-builder.AppImage" ] && wget -qO appimage-builder.AppImage \
https://github.com/AppImageCrafters/appimage-builder/releases/download/v0.9.2/appimage-builder-0.9.2-35e3eab-x86_64.AppImage https://github.com/AppImageCrafters/appimage-builder/releases/download/v0.9.2/appimage-builder-0.9.2-35e3eab-x86_64.AppImage
@@ -479,7 +485,7 @@ else
rm -rf "$project-"*".AppImage" rm -rf "$project-"*".AppImage"
# Run appimage-builder in extract-and-run mode for Docker compatibility. # Run appimage-builder in extract-and-run mode for Docker compatibility.
project="$project" project_lower="$project_lower" arch_deb="$arch_deb" arch_appimage="$arch_appimage" \ project="$project" project_lower="$project_lower" project_version="$project_version" arch_deb="$arch_deb" arch_appimage="$arch_appimage" \
APPIMAGE_EXTRACT_AND_RUN=1 ./appimage-builder.AppImage --recipe .ci/AppImageBuilder.yml APPIMAGE_EXTRACT_AND_RUN=1 ./appimage-builder.AppImage --recipe .ci/AppImageBuilder.yml
status=$? status=$?