From 2287aba7fa18e18a49d6263463f98ce571f55daf Mon Sep 17 00:00:00 2001 From: Kalila L Date: Mon, 1 Feb 2021 05:10:45 -0500 Subject: [PATCH] Update installer names and images "Alpha" -> "" --- .github/workflows/master_build.yml | 6 +++--- .github/workflows/pr_build.yml | 4 ++-- android/build_android.sh | 2 +- cmake/installer/installer-header.bmp | Bin 102654 -> 102654 bytes cmake/installer/uninstaller-header.bmp | Bin 102654 -> 102654 bytes cmake/macros/GenerateInstallers.cmake | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml index 2caddef182..ee6ef88d0e 100644 --- a/.github/workflows/master_build.yml +++ b/.github/workflows/master_build.yml @@ -83,15 +83,15 @@ jobs: shell: bash run: | echo "${{ steps.buildenv1.outputs.symbols_archive }}" - echo "ARTIFACT_PATTERN=Vircadia-Alpha-*.$INSTALLER_EXT" >> $GITHUB_ENV + echo "ARTIFACT_PATTERN=Vircadia-*.$INSTALLER_EXT" >> $GITHUB_ENV # Build type variables echo "GIT_COMMIT_SHORT=${{ steps.buildenv1.outputs.github_sha_short }}" >> $GITHUB_ENV if [ "${{ matrix.build_type }}" = "full" ]; then echo "CLIENT_ONLY=FALSE" >> $GITHUB_ENV - echo "INSTALLER=Vircadia-Alpha-$BUILD_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV + echo "INSTALLER=Vircadia-$BUILD_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV else echo "CLIENT_ONLY=TRUE" >> $GITHUB_ENV - echo "INSTALLER=Vircadia-Alpha-Interface-$BUILD_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV + echo "INSTALLER=Vircadia-Interface-$BUILD_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV fi - name: Clear working directory if: startsWith(matrix.os, 'windows') diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 8a3dce98ec..9d6984b5b2 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -86,9 +86,9 @@ jobs: echo "${{ steps.buildenv1.outputs.symbols_archive }}" echo "GIT_COMMIT_SHORT=${{ steps.buildenv1.outputs.github_sha_short }}" >> $GITHUB_ENV if [[ "${{ matrix.build_type }}" != "android" ]]; then - echo "ARTIFACT_PATTERN=Vircadia-Alpha-PR${{ github.event.number }}-*.$INSTALLER_EXT" >> $GITHUB_ENV + echo "ARTIFACT_PATTERN=Vircadia-PR${{ github.event.number }}-*.$INSTALLER_EXT" >> $GITHUB_ENV # Build type variables - echo "INSTALLER=Vircadia-Alpha-$RELEASE_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV + echo "INSTALLER=Vircadia-$RELEASE_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV else echo "ARTIFACT_PATTERN=*.$INSTALLER_EXT" >> $GITHUB_ENV fi diff --git a/android/build_android.sh b/android/build_android.sh index 9cf1b9e2ab..d3c79afdbe 100755 --- a/android/build_android.sh +++ b/android/build_android.sh @@ -17,7 +17,7 @@ fi ANDROID_APP=interface ANDROID_OUTPUT_DIR=./apps/${ANDROID_APP}/build/outputs/apk/${ANDROID_BUILD_TYPE} ANDROID_OUTPUT_FILE=${ANDROID_APP}-${ANDROID_BUILD_TYPE}.apk -ANDROID_APK_NAME=Vircadia-Alpha-${ANDROID_APK_SUFFIX} +ANDROID_APK_NAME=Vircadia-${ANDROID_APK_SUFFIX} ./gradlew -PHIFI_ANDROID_PRECOMPILED=${HIFI_ANDROID_PRECOMPILED} -PVERSION_CODE=${VERSION_CODE} -PRELEASE_NUMBER=${RELEASE_NUMBER} -PRELEASE_TYPE=${RELEASE_TYPE} ${ANDROID_APP}:${ANDROID_BUILD_TARGET} cp ${ANDROID_OUTPUT_DIR}/${ANDROID_OUTPUT_FILE} ./${ANDROID_APK_NAME} diff --git a/cmake/installer/installer-header.bmp b/cmake/installer/installer-header.bmp index de8448ed44c17f3b918e47d1715a83058d1b9a53..a9519f02551c964b0b6229f8f24d45e59672bf67 100644 GIT binary patch literal 102654 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