Fix linter errors

bitwarden · Jan 6, 2025 · e10a0f6 · e10a0f6
1 parent e50175a
commit e10a0f6
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 25 deletions.
diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml
@@ -47,9 +47,9 @@ jobs:
     runs-on: macos-14
     needs: setup
     env:
-      ios_folder_path: src/App/Platforms/iOS
-      app_output_name: App
-      app_ci_output_filename: App_x64_Debug
+      _ios_folder_path: src/App/Platforms/iOS
+      _app_output_name: App
+      _app_ci_output_filename: App_x64_Debug
     steps:
       - name: Set XCode version
         uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0
@@ -135,7 +135,7 @@ jobs:
 
           echo "### CFBundleVersion $BUILD_NUMBER" >> $GITHUB_STEP_SUMMARY
 
-          perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./${{ env.ios_folder_path }}/Info.plist
+          perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./${{ env._ios_folder_path }}/Info.plist
           perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.Extension/Info.plist
           perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.Autofill/Info.plist
           perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.ShareExtension/Info.plist
@@ -145,7 +145,7 @@ jobs:
       - name: Update Entitlements
         run: |
           echo "##### Updating Entitlements"
-          perl -0777 -pi.bak -e 's/<key>aps-environment<\/key>\s*<string>development<\/string>/<key>aps-environment<\/key>\n\t<string>beta<\/string>/' ./${{ env.ios_folder_path }}/Entitlements.plist
+          perl -0777 -pi.bak -e 's/<key>aps-environment<\/key>\s*<string>development<\/string>/<key>aps-environment<\/key>\n\t<string>beta<\/string>/' ./${{ env._ios_folder_path }}/Entitlements.plist
 
       - name: Get certificates
         run: |
@@ -245,8 +245,8 @@ jobs:
           ARCHIVE_PATH: ./${{ env.main_app_folder_path }}/bin/Debug/${{ env.target-net-version }}-ios/iossimulator-x64
           EXPORT_PATH: ./bitwarden-export
         run: |
-          zip -r -q ${{ env.app_ci_output_filename }}.app.zip $ARCHIVE_PATH
-          mv ${{ env.app_ci_output_filename }}.app.zip $EXPORT_PATH
+          zip -r -q ${{ env._app_ci_output_filename }}.app.zip $ARCHIVE_PATH
+          mv ${{ env._app_ci_output_filename }}.app.zip $EXPORT_PATH
 
       - name: Show Bitwarden Export
         shell: bash
@@ -276,8 +276,8 @@ jobs:
       - name: Upload .app file for Automation CI
         uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
         with:
-          name: ${{ env.app_ci_output_filename }}.app.zip
-          path: ./bitwarden-export/${{ env.app_ci_output_filename }}.app.zip
+          name: ${{ env._app_ci_output_filename }}.app.zip
+          path: ./bitwarden-export/${{ env._app_ci_output_filename }}.app.zip
           if-no-files-found: error
 
       - name: Install AppCenter CLI

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -70,8 +70,8 @@ jobs:
       matrix:
         variant: ["prod", "qa"]
     env:
-      android_folder_path: src\App\Platforms\Android
-      android_folder_path_bash: src/App/Platforms/Android
+      _android_folder_path: src\App\Platforms\Android
+      _android_folder_path_bash: src/App/Platforms/Android
     steps:
       - name: Checkout repo
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -126,9 +126,9 @@ jobs:
           mkdir -p $HOME/secrets
 
           az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
-          --name app_play-keystore.jks --file ./${{ env.android_folder_path_bash }}/app_play-keystore.jks --output none
+          --name app_play-keystore.jks --file ./${{ env._android_folder_path_bash }}/app_play-keystore.jks --output none
           az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
-          --name app_upload-keystore.jks --file ./${{ env.android_folder_path_bash }}/app_upload-keystore.jks --output none
+          --name app_upload-keystore.jks --file ./${{ env._android_folder_path_bash }}/app_upload-keystore.jks --output none
           az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
           --name play_creds.json --file $HOME/secrets/play_creds.json --output none
         shell: bash
@@ -140,7 +140,7 @@ jobs:
           CONTAINER_NAME: mobile
         run: |
           az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME \
-          --name google-services.json --file ./${{ env.android_folder_path_bash }}/google-services.json --output none
+          --name google-services.json --file ./${{ env._android_folder_path_bash }}/google-services.json --output none
         shell: bash
 
       - name: Increment version
@@ -149,7 +149,7 @@ jobs:
           echo "##### Setting Android Version Code to $BUILD_NUMBER" | tee -a $GITHUB_STEP_SUMMARY
 
           sed -i "s/android:versionCode=\"1\"/android:versionCode=\"$BUILD_NUMBER\"/" \
-            ./${{ env.android_folder_path_bash }}/AndroidManifest.xml
+            ./${{ env._android_folder_path_bash }}/AndroidManifest.xml
         shell: bash
 
       - name: Restore packages
@@ -193,7 +193,7 @@ jobs:
           }
           Write-Output "##### Sign Google Play Bundle Release Configuration"
 
-          $signingUploadKeyStore = "$($env:GITHUB_WORKSPACE)\${{ env.android_folder_path }}\app_upload-keystore.jks"
+          $signingUploadKeyStore = "$($env:GITHUB_WORKSPACE)\${{ env._android_folder_path }}\app_upload-keystore.jks"
           dotnet publish $projToBuild -c Release -f ${{ env.target-net-version }}-android `
             /p:AndroidPackageFormats=aab `
             /p:AndroidKeyStore=true `
@@ -210,7 +210,7 @@ jobs:
 
           Write-Output "##### Sign APK Release Configuration"
 
-          $signingPlayKeyStore = "$($env:GITHUB_WORKSPACE)\${{ env.android_folder_path }}\app_play-keystore.jks"
+          $signingPlayKeyStore = "$($env:GITHUB_WORKSPACE)\${{ env._android_folder_path }}\app_play-keystore.jks"
           dotnet publish $projToBuild -c Release -f ${{ env.target-net-version }}-android `
             /p:AndroidKeyStore=true `
             /p:AndroidSigningKeyStore=$signingPlayKeyStore `
@@ -295,8 +295,8 @@ jobs:
     name: F-Droid Build
     runs-on: windows-2022
     env:
-      android_folder_path: src\App\Platforms\Android
-      android_folder_path_bash: src/App/Platforms/Android
+      _android_folder_path: src\App\Platforms\Android
+      _android_folder_path_bash: src/App/Platforms/Android
       android_manifest_path: src/App/Platforms/Android/AndroidManifest.xml
     steps:
       - name: Checkout repo
@@ -350,7 +350,7 @@ jobs:
           FILE: app_fdroid-keystore.jks
         run: |
           az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME --name $FILE \
-            --file ${{ env.android_folder_path_bash }}/$FILE --output none
+            --file ${{ env._android_folder_path_bash }}/$FILE --output none
         shell: bash
 
       - name: Increment version
@@ -399,7 +399,7 @@ jobs:
 
           Write-Output "##### Sign FDroid"
 
-          $signingFdroidKeyStore = "$($env:GITHUB_WORKSPACE)\${{ env.android_folder_path }}\app_fdroid-keystore.jks"
+          $signingFdroidKeyStore = "$($env:GITHUB_WORKSPACE)\${{ env._android_folder_path }}\app_fdroid-keystore.jks"
           dotnet build $projToBuild -c Release -f ${{ env.target-net-version }}-android `
             /p:AndroidKeyStore=true `
             /p:AndroidSigningKeyStore=$signingFdroidKeyStore `

diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml
@@ -5,12 +5,13 @@ on:
 
 jobs:
   labeler:
-    name: "Pull Request Labeler"
+    name: "Pull request labeler"
     permissions:
       contents: read
       pull-requests: write
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
+      - name: "Label pull request"
+        uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
         with:
           sync-labels: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
     name: Create Release
     runs-on: ubuntu-22.04
     outputs:
-      branch-name: ${{ steps.branch.outputs.branch-name }}
+      branch_name: ${{ steps.branch.outputs.branch-name }}
     steps:
       - name: Branch check
         if: inputs.release_type != 'Dry Run'
@@ -139,7 +139,7 @@ jobs:
         with:
           workflow: build.yml
           workflow_conclusion: success
-          branch: ${{ needs.release.outputs.branch-name }}
+          branch: ${{ needs.release.outputs.branch_name }}
 
       - name: Dry Run - Download F-Droid .apk artifact
         if: ${{ inputs.release_type == 'Dry Run' }}