summaryrefslogtreecommitdiffstats
path: root/.ci
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2022-09-16 18:47:38 +0200
committerGitHub <noreply@github.com>2022-09-16 18:47:38 +0200
commit882dfa36ae25fc6d0167c2c0fbce1e19c1406fae (patch)
tree0d4ccca773814ac3c1c2dc98a5bae11acd0295cb /.ci
parentMerge pull request #8911 from lioncash/cexpr-string (diff)
parentpatreon step2: Use jobs to build for Windows and Linux (diff)
downloadyuzu-882dfa36ae25fc6d0167c2c0fbce1e19c1406fae.tar
yuzu-882dfa36ae25fc6d0167c2c0fbce1e19c1406fae.tar.gz
yuzu-882dfa36ae25fc6d0167c2c0fbce1e19c1406fae.tar.bz2
yuzu-882dfa36ae25fc6d0167c2c0fbce1e19c1406fae.tar.lz
yuzu-882dfa36ae25fc6d0167c2c0fbce1e19c1406fae.tar.xz
yuzu-882dfa36ae25fc6d0167c2c0fbce1e19c1406fae.tar.zst
yuzu-882dfa36ae25fc6d0167c2c0fbce1e19c1406fae.zip
Diffstat (limited to '.ci')
-rwxr-xr-x.ci/scripts/linux/upload.sh25
-rw-r--r--.ci/yuzu-patreon-step2.yml25
2 files changed, 42 insertions, 8 deletions
diff --git a/.ci/scripts/linux/upload.sh b/.ci/scripts/linux/upload.sh
index 8173c5728..e0f336427 100755
--- a/.ci/scripts/linux/upload.sh
+++ b/.ci/scripts/linux/upload.sh
@@ -5,21 +5,24 @@
. .ci/scripts/common/pre-upload.sh
-APPIMAGE_NAME="yuzu-${GITDATE}-${GITREV}.AppImage"
-REV_NAME="yuzu-linux-${GITDATE}-${GITREV}"
+APPIMAGE_NAME="yuzu-${RELEASE_NAME}-${GITDATE}-${GITREV}.AppImage"
+BASE_NAME="yuzu-linux"
+REV_NAME="${BASE_NAME}-${GITDATE}-${GITREV}"
ARCHIVE_NAME="${REV_NAME}.tar.xz"
COMPRESSION_FLAGS="-cJvf"
-if [ "${RELEASE_NAME}" = "mainline" ]; then
- DIR_NAME="${REV_NAME}"
+if [ "${RELEASE_NAME}" = "mainline" ] || [ "${RELEASE_NAME}" = "early-access" ]; then
+ DIR_NAME="${BASE_NAME}-${RELEASE_NAME}"
else
- DIR_NAME="${REV_NAME}_${RELEASE_NAME}"
+ DIR_NAME="${REV_NAME}-${RELEASE_NAME}"
fi
mkdir "$DIR_NAME"
cp build/bin/yuzu-cmd "$DIR_NAME"
-cp build/bin/yuzu "$DIR_NAME"
+if [ "${RELEASE_NAME}" != "early-access" ] && [ "${RELEASE_NAME}" != "mainline" ]; then
+ cp build/bin/yuzu "$DIR_NAME"
+fi
# Build an AppImage
cd build
@@ -32,6 +35,11 @@ if ! ./appimagetool-x86_64.AppImage --version; then
export APPIMAGE_EXTRACT_AND_RUN=1
fi
+# Don't let AppImageLauncher ask to integrate EA
+if [ "${RELEASE_NAME}" = "mainline" ] || [ "${RELEASE_NAME}" = "early-access" ]; then
+ echo "X-AppImage-Integrate=false" >> AppDir/org.yuzu_emu.yuzu.desktop
+fi
+
if [ "${RELEASE_NAME}" = "mainline" ]; then
# Generate update information if releasing to mainline
./appimagetool-x86_64.AppImage -u "gh-releases-zsync|yuzu-emu|yuzu-${RELEASE_NAME}|latest|yuzu-*.AppImage.zsync" AppDir "${APPIMAGE_NAME}"
@@ -46,4 +54,9 @@ if [ -f "build/${APPIMAGE_NAME}.zsync" ]; then
cp "build/${APPIMAGE_NAME}.zsync" "${ARTIFACTS_DIR}/"
fi
+# Copy the AppImage to the general release directory and remove git revision info
+if [ "${RELEASE_NAME}" = "mainline" ] || [ "${RELEASE_NAME}" = "early-access" ]; then
+ cp "build/${APPIMAGE_NAME}" "${DIR_NAME}/yuzu-${RELEASE_NAME}.AppImage"
+fi
+
. .ci/scripts/common/post-upload.sh
diff --git a/.ci/yuzu-patreon-step2.yml b/.ci/yuzu-patreon-step2.yml
index 5d5b140fd..71a23ebe6 100644
--- a/.ci/yuzu-patreon-step2.yml
+++ b/.ci/yuzu-patreon-step2.yml
@@ -11,9 +11,30 @@ stages:
- stage: build
displayName: 'build'
jobs:
- - job: build
+ - job: linux
timeoutInMinutes: 120
- displayName: 'windows-msvc'
+ displayName: 'linux'
+ pool:
+ vmImage: ubuntu-latest
+ strategy:
+ maxParallel: 10
+ matrix:
+ linux:
+ BuildSuffix: 'linux'
+ ScriptFolder: 'linux'
+ steps:
+ - template: ./templates/sync-source.yml
+ parameters:
+ artifactSource: $(parameters.artifactSource)
+ needSubmodules: 'true'
+ - template: ./templates/build-single.yml
+ parameters:
+ artifactSource: 'false'
+ cache: $(parameters.cache)
+ version: $(DisplayVersion)
+ - job: msvc
+ timeoutInMinutes: 120
+ displayName: 'windows'
pool:
vmImage: windows-2022
steps: