Merge branch 'citra-emu:master' into arm64-take-2

.ci/android.sh

@@ -15,7 +15,7 @@ chmod +x ./gradlew
 ./gradlew assemble${BUILD_FLAVOR}Release
 ./gradlew bundle${BUILD_FLAVOR}Release
 
-ccache -s
+ccache -s -v
 
 if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
     rm "${ANDROID_KEYSTORE_FILE}"

.ci/ios.sh

@@ -12,4 +12,4 @@ cmake .. -GNinja \
     -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON
 ninja
 
-ccache -s
+ccache -s -v

.ci/linux.sh

@@ -1,10 +1,15 @@
-#!/bin/sh -ex
+#!/bin/bash -ex
+
+if [ "$TARGET" = "appimage" ]; then
+    export COMPILER_FLAGS=(-DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_LINKER=/etc/bin/ld.lld)
+fi
 
 mkdir build && cd build
 cmake .. -G Ninja \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_C_COMPILER_LAUNCHER=ccache \
     -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+    "${COMPILER_FLAGS[@]}" \
     -DENABLE_QT_TRANSLATION=ON \
     -DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON \
     -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
@@ -13,8 +18,10 @@ ninja
 
 if [ "$TARGET" = "appimage" ]; then
     ninja bundle
+    # TODO: Our AppImage environment currently uses an older ccache version without the verbose flag.
+    ccache -s
+else
+    ccache -s -v
 fi
 
-ccache -s
-
 ctest -VV -C Release

.ci/macos.sh

@@ -13,7 +13,7 @@ cmake .. -GNinja \
 ninja
 ninja bundle
 
-ccache -s
+ccache -s -v
 
 CURRENT_ARCH=`arch`
 if [ "$TARGET" = "$CURRENT_ARCH" ]; then

.ci/pack.sh

@@ -1,41 +1,72 @@
 #!/bin/bash -ex
 
+# Determine the full revision name.
 GITDATE="`git show -s --date=short --format='%ad' | sed 's/-//g'`"
 GITREV="`git show -s --format='%h'`"
-REV_NAME="citra-${OS}-${TARGET}-${GITDATE}-${GITREV}"
+REV_NAME="citra-$OS-$TARGET-$GITDATE-$GITREV"
 
-# Find out what release we are building
+# Determine the name of the release being built.
 if [[ "$GITHUB_REF_NAME" =~ ^canary- ]] || [[ "$GITHUB_REF_NAME" =~ ^nightly- ]]; then
     RELEASE_NAME=$(echo $GITHUB_REF_NAME | cut -d- -f1)
 else
     RELEASE_NAME=head
 fi
 
-mkdir -p artifacts
+# Archive and upload the artifacts.
+mkdir artifacts
 
-if [ -z "${UPLOAD_RAW}" ]; then
-    # Archive and upload the artifacts.
+function pack_artifacts() {
+    ARTIFACTS_PATH="$1"
+
+    # Set up root directory for archive.
     mkdir "$REV_NAME"
-    mv build/bundle/* "$REV_NAME"
+    if [ -f "$ARTIFACTS_PATH" ]; then
+        mv "$ARTIFACTS_PATH" "$REV_NAME"
 
-    if [ "$OS" = "windows" ]; then
-        ARCHIVE_NAME="${REV_NAME}.zip"
-        powershell Compress-Archive "$REV_NAME" "$ARCHIVE_NAME"
-    else
-        ARCHIVE_NAME="${REV_NAME}.tar.gz"
-        tar czvf "$ARCHIVE_NAME" "$REV_NAME"
-    fi
-
-    mv "$REV_NAME" $RELEASE_NAME
-    7z a "$REV_NAME.7z" $RELEASE_NAME
-
-    mv "$ARCHIVE_NAME" artifacts/
-    mv "$REV_NAME.7z" artifacts/
-else
-    # Directly upload the raw artifacts, renamed with the revision.
-    for ARTIFACT in build/bundle/*; do
+        # Use file extension to differentiate archives.
         FILENAME=$(basename "$ARTIFACT")
         EXTENSION="${FILENAME##*.}"
-        mv "$ARTIFACT" "artifacts/$REV_NAME.$EXTENSION"
+        ARCHIVE_NAME="$REV_NAME.$EXTENSION"
+    else
+        mv "$ARTIFACTS_PATH"/* "$REV_NAME"
+
+        ARCHIVE_NAME="$REV_NAME"
+    fi
+
+    # Create .zip/.tar.gz
+    if [ "$OS" = "windows" ]; then
+        ARCHIVE_FULL_NAME="$ARCHIVE_NAME.zip"
+        powershell Compress-Archive "$REV_NAME" "$ARCHIVE_FULL_NAME"
+    elif [ "$OS" = "android" ]; then
+        ARCHIVE_FULL_NAME="$ARCHIVE_NAME.zip"
+        zip -r "$ARCHIVE_FULL_NAME" "$REV_NAME"
+    else
+        ARCHIVE_FULL_NAME="$ARCHIVE_NAME.tar.gz"
+        tar czvf "$ARCHIVE_FULL_NAME" "$REV_NAME"
+    fi
+    mv "$ARCHIVE_FULL_NAME" artifacts/
+
+    if [ -z "$SKIP_7Z" ]; then
+        # Create .7z
+        ARCHIVE_FULL_NAME="$ARCHIVE_NAME.7z"
+        mv "$REV_NAME" "$RELEASE_NAME"
+        7z a "$ARCHIVE_FULL_NAME" "$RELEASE_NAME"
+        mv "$ARCHIVE_FULL_NAME" artifacts/
+
+        # Clean up created release artifacts directory.
+        rm -rf "$RELEASE_NAME"
+    else
+        # Clean up created rev artifacts directory.
+        rm -rf "$REV_NAME"
+    fi
+}
+
+if [ -z "$PACK_INDIVIDUALLY" ]; then
+    # Pack all of the artifacts at once.
+    pack_artifacts build/bundle
+else
+    # Pack and upload the artifacts one-by-one.
+    for ARTIFACT in build/bundle/*; do
+        pack_artifacts "$ARTIFACT"
     done
 fi

.ci/windows.sh

@@ -12,6 +12,6 @@ cmake .. -G Ninja \
 ninja
 ninja bundle
 
-ccache -s
+ccache -s -v
 
 ctest -VV -C Release || echo "::error ::Test error occurred on Windows build"