From 7f92358d9b18f94fb2208cc75b4eeca234943e6c Mon Sep 17 00:00:00 2001 From: Vince Grassia <593223+vgrassia@users.noreply.github.com> Date: Mon, 4 Mar 2024 15:11:54 +0000 Subject: [PATCH] Fix GoogleServices file location (#3053) (cherry picked from commit 6f6487ccc9c5742a78147295e510254e9be13e44) --- .github/workflows/build.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 23395a378..0315e67f3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,7 +85,7 @@ jobs: - name: Set up MSBuild uses: microsoft/setup-msbuild@ede762b26a2de8d110bb5a3db4d7e0e080c0e917 # v1.3.3 - # This step might be obsolete at some point as .NET MAUI workloads + # This step might be obsolete at some point as .NET MAUI workloads # are starting to come pre-installed on the GH Actions build agents. - name: Install MAUI Workload run: dotnet workload install maui --ignore-failed-sources @@ -150,7 +150,7 @@ jobs: echo "########################################" echo "##### Setting Version Code $BUILD_NUMBER" echo "########################################" - + sed -i "s/android:versionCode=\"1\"/android:versionCode=\"$BUILD_NUMBER\"/" \ ./${{ env.android_folder_path_bash }}/AndroidManifest.xml shell: bash @@ -314,7 +314,7 @@ jobs: - name: Set up MSBuild uses: microsoft/setup-msbuild@ede762b26a2de8d110bb5a3db4d7e0e080c0e917 # v1.3.3 - # This step might be obsolete at some point as .NET MAUI workloads + # This step might be obsolete at some point as .NET MAUI workloads # are starting to come pre-installed on the GH Actions build agents. - name: Install MAUI Workload run: dotnet workload install maui --ignore-failed-sources @@ -395,7 +395,7 @@ jobs: $projToBuild = $($env:GITHUB_WORKSPACE + "/${{ env.main_app_project_path }}"); Write-Output "##### Build $configuration FDROID" - + dotnet build $projToBuild -c $configuration -f ${{ env.target-net-version }}-android /p:CustomConstants="FDROID" - name: Sign for F-Droid @@ -454,13 +454,13 @@ jobs: uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0 with: nuget-version: 6.4.0 - + - name: Set up .NET uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0 with: dotnet-version: '8.0.x' - - # This step might be obsolete at some point as .NET MAUI workloads + + # This step might be obsolete at some point as .NET MAUI workloads # are starting to come pre-installed on the GH Actions build agents. - name: Install MAUI Workload run: dotnet workload install maui --ignore-failed-sources @@ -518,7 +518,7 @@ jobs: run: | mkdir -p $HOME/secrets az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME --name $FILE \ - --file $HOME/secrets/$FILE --output none + --file src/watchOS/bitwarden/$FILE --output none - name: Increment version run: | @@ -544,7 +544,7 @@ jobs: mkdir -p $HOME/certificates az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/ios-distribution | jq -r .value | base64 -d > $HOME/certificates/ios-distribution.p12 - + - name: Set up Keychain env: KEYCHAIN_PASSWORD: ${{ secrets.IOS_KEYCHAIN_PASSWORD }} @@ -744,7 +744,7 @@ jobs: CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }} with: config: crowdin.yml - crowdin_branch_name: main + crowdin_branch_name: main upload_sources: true upload_translations: false