Skip to content

Commit

Permalink
Merge branch 'master' into release/1.2.0-2024.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ellizio committed Aug 21, 2024
2 parents 42f7f80 + 6014a51 commit 3ff97fb
Show file tree
Hide file tree
Showing 19 changed files with 364 additions and 287 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-Build-${{ hashFiles('gradlew.bat', 'src/dotnet/*/*.csproj', 'src/dotnet/*.props', 'gradle-wrapper.properties') }}
- run: ./gradlew :rdgen --no-daemon
- run: ./gradlew :protocol:rdgen --no-daemon
- run: ./gradlew :buildPlugin -PBuildConfiguration=Release --no-daemon
- uses: mad9000/actions-find-and-replace-string@5
id: fix_branch_name
Expand Down Expand Up @@ -48,5 +48,5 @@ jobs:
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-Test-${{ hashFiles('gradlew.bat', 'src/dotnet/*/*.csproj', 'src/dotnet/*.props', 'gradle-wrapper.properties') }}
- run: ./gradlew :rdgen --no-daemon
- run: ./gradlew :protocol:rdgen --no-daemon
- run: ./gradlew :testDotNet --no-daemon
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ output
*.cache

# IDEs
/.intellijPlatform
/.idea/*.iml
/.idea/*.xml
/.idea/.idea.*/*.iml
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion .idea/runConfigurations/Rider.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions .idea/runConfigurations/rdgen.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

239 changes: 0 additions & 239 deletions build.gradle

This file was deleted.

Loading

0 comments on commit 3ff97fb

Please sign in to comment.