Attempting to fix CI for ARM Mac and older dotnet format tool compatb…

…ility
dropbox · May 10, 2024 · 12c5a6d · 12c5a6d
1 parent a7d7f81
commit 12c5a6d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
   UnitTests:
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-13, ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -29,7 +29,7 @@ jobs:
   IntegrationTests:
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-13, ubuntu-latest, windows-latest]
       max-parallel: 1
     runs-on: ${{ matrix.os }}
     steps:
@@ -62,13 +62,13 @@ jobs:
   Linter:
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest, windows-latest]
+        os: [macos-13, ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - name: Run Linter
         run: |
           # Install latest dotnet-format
-          dotnet tool install -g dotnet-format --version 6.0.241801 --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
+          dotnet tool install -g dotnet-format --version "5.*" --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
           dotnet restore dropbox-sdk-dotnet/
           dotnet format --check --fix-whitespace --fix-style warn --fix-analyzers warn dropbox-sdk-dotnet/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -49,21 +49,11 @@ You can use [dotnet-format](https://github.com/dotnet/format) to lint from the c
 
 ```sh
 # Install a recent dotnet-format build
-dotnet tool install -g dotnet-format --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
+dotnet tool install -g dotnet-format --version "5.*" --add-source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
 # Optionally omit `--check` to auto-fix lint issues
 dotnet format --check --fix-whitespace --fix-style info --fix-analyzers info dropbox-sdk-dotnet/
 ```
 
-### Updating Generated Code
-
-Install PowerShell and execute `./scripts/generate_stone.ps1` to regenerate Stone types.
-
-```sh
-git submodule init
-git submodule update --remote --recursive
-./scripts/generate_stone.ps1
-```
-
 ### Cutting New Versions (for Dropboxers)
 
 To cut a new version, create a new GitHub release using `vX.Y.Z` as the tag name. GitHub Actions will automatically build the SDK and publish it to NuGet as version `X.Y.Z`.