Merge branch 'main' into ChangelogUpdateFor1.0Release

bitwarden · Oct 10, 2024 · 650d3f3 · 650d3f3
2 parents 5411f73 + 0ae6d73
commit 650d3f3
Show file tree

Hide file tree

Showing 14 changed files with 116 additions and 494 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -12,17 +12,17 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-[*.{ts}]
-quote_type = single
+[*.ts]
+quote_type = double
 
-[*.{rs}]
+[*.rs]
 indent_style = space
 indent_size = 4
 
 [*.{kt,java,xml,gradle}]
 indent_style = space
 indent_size = 4
 
-[*.{xml}]
+[*.xml]
 # VS Code XML extension removes the final newline
 insert_final_newline = false
diff --git a/.github/workflows/build-cpp.yml b/.github/workflows/build-cpp.yml
@@ -95,15 +95,13 @@ jobs:
         working-directory: languages/cpp
         shell: bash
         run: |
-          mv include/release/* include/
           if [[ '${{ runner.os }}' == 'macOS' || '${{ runner.os }}' == 'Linux' ]]; then
             ls include/libbitwarden_c.* || { echo "Missing libbitwarden_c.*"; exit 1; }
           fi
           if [[ '${{ runner.os }}' == 'Windows' ]]; then
             ls include/bitwarden_c.dll || { echo "Missing bitwarden_c.dll"; exit 1; }
             ls include/bitwarden_c.dll.lib || { echo "Missing bitwarden_c.dll.lib"; exit 1; }
           fi
-          rmdir include/release
 
       - name: Build unix
         working-directory: languages/cpp