Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SLOMNI-15 Bootstrap pipeline on Cirrus #8

Merged
merged 52 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
77c4e43
Update Readme text and fix broken link.
JoeRobich Nov 1, 2023
1c3c7a3
Update SDK versions to latest
JoeRobich Nov 16, 2023
5323ad7
Auto generate app.config.
JoeRobich Nov 21, 2023
6d408a6
Remove unused dependencies
JoeRobich Nov 22, 2023
dc4cde7
Update dependency verisons
JoeRobich Nov 22, 2023
753f81d
Fix xUnit warnings
JoeRobich Nov 22, 2023
1deb7b1
Fix decompiler tests
JoeRobich Nov 22, 2023
0152591
Add AspNetCore EA library
JoeRobich Nov 22, 2023
2d8f1a1
Add BenchmarkDotNet dependency to package mapping
JoeRobich Nov 22, 2023
8f5f7e2
Downgrade MSBuildPackageVersion.
JoeRobich Dec 19, 2023
c3e291b
Update Roslyn to 4.9.0-3.23611.3
JoeRobich Dec 19, 2023
47e0a7b
Fix failing test
JoeRobich Dec 19, 2023
fac4edd
Fix semantic highlight test
JoeRobich Dec 19, 2023
2fe3738
Merge pull request #2588 from OmniSharp/jorobich/update-versions
JoeRobich Dec 19, 2023
a2546c7
Merge branch 'master' into jorobich/update-readme
JoeRobich Dec 19, 2023
651e9a9
Update changelog for 1.39.11 release
JoeRobich Dec 20, 2023
f473ddc
Fix changelog
JoeRobich Dec 20, 2023
9d4176a
Merge pull request #2591 from OmniSharp/jorobich/update-changelog
JoeRobich Dec 20, 2023
87379c0
Pass project path when performing a restore.
JoeRobich Dec 29, 2023
41dbf7c
Merge pull request #2593 from OmniSharp/jorobich/restore-project
JoeRobich Dec 30, 2023
f768329
Update SDKs and add 9.0 preview 1.
JoeRobich Feb 16, 2024
476a2bd
Update Roslyn to 4.10.0-2.24112.8
JoeRobich Feb 16, 2024
e2bf95b
Update changelog
JoeRobich Feb 16, 2024
5309810
Ensure we are shipping SQLitePCLRaw 2.1.0 for Mono support
JoeRobich Feb 16, 2024
5b06f24
Merge branch 'joerobich/update-sdks-roslyn' of github.com:OmniSharp/o…
JoeRobich Feb 16, 2024
70c8064
Fix DotNetCliServiceFacts test
JoeRobich Feb 16, 2024
8495e47
Merge pull request #2603 from OmniSharp/joerobich/update-sdks-roslyn
JoeRobich Feb 17, 2024
eb1a575
fix #2550 inlay hints lambdas parameter type null reference exception
madiele Feb 17, 2024
ac7b9b8
Merge pull request #2604 from madiele/lambda-param-nullref
JoeRobich Feb 22, 2024
2ad5dea
Remove NuGet.Packaging.Core
nkolev92 Apr 11, 2024
6f87287
Update NuGet version
JoeRobich Jun 27, 2024
23dccf0
Move to macos-12 image
JoeRobich Jul 2, 2024
66ff5f6
Fix casing
JoeRobich Jul 2, 2024
4ed2ca7
Bump S.T.J to version 8.0.4
JoeRobich Jul 19, 2024
2dad815
Merge pull request #2617 from OmniSharp/dev/jorobich/remove-nugetpack…
JoeRobich Jul 19, 2024
d83078b
Update Roslyn to 4.12.0-1.24358.3
JoeRobich Jul 19, 2024
51c9515
Reorder test runs in CI
JoeRobich Jul 20, 2024
50c401d
Fix test
JoeRobich Jul 23, 2024
57f5898
Fix code fix construction
JoeRobich Jul 25, 2024
50095f2
Merge pull request #2620 from OmniSharp/dev/jorobich/fix-codefixer-lo…
JoeRobich Jul 26, 2024
cce743f
Request completions until timeout in LSP tests
JoeRobich Jul 26, 2024
33bc91a
Revert fix test
JoeRobich Jul 26, 2024
ce58118
Free up space in ADO CI
JoeRobich Jul 26, 2024
2efe02c
Merge branch 'master' into update-roslyn-3
JoeRobich Jul 26, 2024
3b721df
Merge pull request #2619 from OmniSharp/update-roslyn-3
JoeRobich Jul 26, 2024
f2cada0
Update .NET SDKs
JoeRobich Jul 26, 2024
1c0ccbd
Update Changelog for 1.39.12 release
JoeRobich Jul 26, 2024
915163d
Merge pull request #2621 from OmniSharp/update-sdks-2
JoeRobich Jul 26, 2024
2bd9929
SLOMNI-15 Create build pipeline on Cirrus
jblievremont Aug 23, 2024
dcdb117
SLOMNI-15 Bring back changes from Sonar patch
jblievremont Aug 26, 2024
b29f8af
Merge tag 'v1.39.12' from upstream
jblievremont Aug 27, 2024
36ff0a0
Merge tag 'v1.39.12' from upstream
jblievremont Aug 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .cirrus.star
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
load("github.com/SonarSource/cirrus-modules@v3", "load_features")
def main(ctx):
return load_features(ctx)
52 changes: 52 additions & 0 deletions .cirrus.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
env:
# Allows to run builds for the 50 last commits in a branch:
CIRRUS_CLONE_DEPTH: 50
CIRRUS_SHELL: bash

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Little improvement I see: set CIRRUS_SHELL on the task level; build_linux_task could execute with bash, and build_windows_task could use powershell by default.

SLACK_TOKEN: VAULT[development/kv/data/slack data.token]
SLACK_CHANNEL: squad-ide-intellij-family-bots

only_sonarsource_qa: &ONLY_SONARSOURCE_QA
only_if: $CIRRUS_USER_COLLABORATOR == 'true' && $CIRRUS_TAG == "" && ($CIRRUS_PR != "" || $CIRRUS_BRANCH == "master" || $CIRRUS_BRANCH =~ "branch-.*" || $CIRRUS_BRANCH =~ "dogfood-on-.*")

container_definition: &CONTAINER_DEFINITION
cluster_name: ${CIRRUS_CLUSTER_NAME}
region: eu-central-1
dockerfile: .cirrus/Dockerfile
builder_role: cirrus-builder
builder_image: docker-builder-v*
builder_instance_type: t3.small
docker_arguments:
CIRRUS_AWS_ACCOUNT: ${CIRRUS_AWS_ACCOUNT}

ec2_instance_definition: &INSTANCE_DEFINITION
region: eu-central-1
type: c6i.xlarge
image: base-windows-dotnet-v*
platform: windows

notify_slack_on_failure: &NOTIFY_SLACK_ON_FAILURE
on_failure:
slack_notification_script: source slack-failure-notification

build_linux_task:
<<: *ONLY_SONARSOURCE_QA
eks_container:
<<: *CONTAINER_DEFINITION
cpu: 4
memory: 4G
env:
PATH: ${PATH}:${HOME}/.dotnet/tools
CLR_OPENSSL_VERSION_OVERRIDE: "1.1"
build_linux_script: ./build.sh --target Quick --configuration Release
linux_artifacts:
path: artifacts/package/**/omnisharp-*.*
<<: *NOTIFY_SLACK_ON_FAILURE

build_windows_task:
<<: *ONLY_SONARSOURCE_QA
ec2_instance:
<<: *INSTANCE_DEFINITION
build_windows_script: powershell -File build.ps1 -target Quick -configuration Release
windows_artifacts:
path: artifacts/package/**/omnisharp-*.*
<<: *NOTIFY_SLACK_ON_FAILURE
20 changes: 20 additions & 0 deletions .cirrus/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
ARG CIRRUS_AWS_ACCOUNT
FROM ${CIRRUS_AWS_ACCOUNT}.dkr.ecr.eu-central-1.amazonaws.com/base:j17-latest

USER root
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && \
apt-get install -y ca-certificates gnupg && \
gpg --homedir /tmp --no-default-keyring --keyring /usr/share/keyrings/mono-official-archive-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
echo "deb [signed-by=/usr/share/keyrings/mono-official-archive-keyring.gpg] https://download.mono-project.com/repo/ubuntu stable-focal main" > /etc/apt/sources.list.d/mono-official-stable.list && \
apt-get update && \
apt-get install -y \
dotnet-sdk-8.0 \
mono-complete \
mono-roslyn \
msbuild \
&& rm -rf /var/lib/apt/lists/*

USER sonarsource
WORKDIR /home/sonarsource
10 changes: 6 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@

name: 'Build'
env:
DotNetVersion: "8.0.100-rc.1.23463.5"
DotNetVersion2: "7.0.302"
DotNetVersion3: "6.0.203"
DotNetVersion: "9.0.100-preview.6.24328.19"
DotNetVersion2: "8.0.303"
DotNetVersion3: "7.0.410"
DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
NuGetVersion: "6.5.0"
MonoVersion: "6.12.0"
Artifacts: ${{ github.workspace }}/artifacts/
Expand All @@ -26,7 +27,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, windows-2022, macos-11]
os: [ubuntu-20.04, windows-2022, macos-12]
name: 'Build'
steps:
- name: Checkout
Expand All @@ -52,6 +53,7 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
${{ env.DotNetVersion4 }}
${{ env.DotNetVersion3 }}
${{ env.DotNetVersion2 }}
${{ env.DotNetVersion }}
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/tests-net6.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@

name: 'Tests net6.0'
env:
DotNetVersion: "8.0.100-rc.1.23463.5"
DotNetVersion2: "7.0.302"
DotNetVersion3: "6.0.203"
DotNetVersion: "9.0.100-preview.6.24328.19"
DotNetVersion2: "8.0.303"
DotNetVersion3: "7.0.410"
DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
NuGetVersion: "6.5.0"
MonoVersion: "6.12.0"
Artifacts: ${{ github.workspace }}/artifacts/
Expand All @@ -26,10 +27,10 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, windows-2022, macos-11]
os: [ubuntu-20.04, windows-2022, macos-12]
testProjects:
- OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.Cake.Tests,OmniSharp.Script.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests,OmniSharp.Tests,OmniSharp.Lsp.Tests
- OmniSharp.DotNetTest.Tests
- OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.DotNetTest.Tests,OmniSharp.Cake.Tests
- OmniSharp.Lsp.Tests,OmniSharp.Script.Tests,OmniSharp.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests
name: 'Test'
steps:
- name: Checkout
Expand All @@ -55,6 +56,7 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
${{ env.DotNetVersion4 }}
${{ env.DotNetVersion3 }}
${{ env.DotNetVersion2 }}
${{ env.DotNetVersion }}
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@

name: 'Tests'
env:
DotNetVersion: "8.0.100-rc.1.23463.5"
DotNetVersion2: "7.0.302"
DotNetVersion3: "6.0.203"
DotNetVersion: "9.0.100-preview.6.24328.19"
DotNetVersion2: "8.0.303"
DotNetVersion3: "7.0.410"
DotNetVersion4: "6.0.203" # This is the last version Mono supports. It is used for our Mono CI tests.
NuGetVersion: "6.5.0"
MonoVersion: "6.12.0"
Artifacts: ${{ github.workspace }}/artifacts/
Expand All @@ -26,10 +27,10 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, windows-2022, macos-11]
os: [ubuntu-20.04, windows-2022, macos-12]
testProjects:
- OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.Cake.Tests,OmniSharp.Script.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests,OmniSharp.Tests,OmniSharp.Lsp.Tests
- OmniSharp.DotNetTest.Tests
- OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.DotNetTest.Tests,OmniSharp.Cake.Tests
- OmniSharp.Lsp.Tests,OmniSharp.Script.Tests,OmniSharp.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests
name: 'Test'
steps:
- name: Checkout
Expand All @@ -55,6 +56,7 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
${{ env.DotNetVersion4 }}
${{ env.DotNetVersion3 }}
${{ env.DotNetVersion2 }}
${{ env.DotNetVersion }}
Expand Down
52 changes: 20 additions & 32 deletions .pipelines/init.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
parameters:
# Configuration: Release
Verbosity: Normal
DotNetVersion: "8.0.100-rc.1.23463.5"
DotNetVersion2: "7.0.302"
DotNetVersion3: "6.0.203"
DotNetVersion: "8.0.201"
CakeVersion: "1.1.0"
NuGetVersion: "5.7.0"
MonoVersion: ''
MonoVersion: ""
steps:
- task: DownloadBuildArtifacts@0
displayName: "Download GitVersion Variables"
Expand All @@ -17,53 +15,43 @@ steps:
pipelineId: GitVersion
targetPath: "$(Build.ArtifactStagingDirectory)/gitversion/"
- task: RocketSurgeonsGuild.variable-tools.DeserializeVariables.DeserializeVariables@1
displayName: 'Deserialize GitVersion'
displayName: "Deserialize GitVersion"
inputs:
jsonfiles: $(Build.ArtifactStagingDirectory)/gitversion/**/gitversion.json
- task: UseDotNet@2
displayName: Install dotnet $(DotNetVersion)
inputs:
packageType: 'sdk'
packageType: "sdk"
version: ${{ parameters.DotNetVersion }}
- task: UseDotNet@2
displayName: Install dotnet $(DotNetVersion2)
inputs:
packageType: 'sdk'
version: ${{ parameters.DotNetVersion2 }}
- task: UseDotNet@2
displayName: Install dotnet $(DotNetVersion3)
inputs:
packageType: 'sdk'
version: ${{ parameters.DotNetVersion3 }}
- task: DotNetCoreCLI@2
displayName: 'dotnet install cake'
displayName: "dotnet install cake"
inputs:
command: custom
custom: tool
arguments: 'install -g Cake.Tool --version $(CakeVersion)'
workingDirectory: '$(Build.ArtifactStagingDirectory)'
arguments: "install -g Cake.Tool --version $(CakeVersion)"
workingDirectory: "$(Build.ArtifactStagingDirectory)"
env:
CakeVersion: ${{ parameters.CakeVersion }}
- task: NuGetToolInstaller@0
displayName: "Get NuGet"
inputs:
versionSpec: ${{ parameters.NuGetVersion }}
- task: NuGetCommand@2
displayName: 'Cake restore packages.config'
displayName: "Cake restore packages.config"
inputs:
command: custom
feedsToUse: config
arguments: install tools/packages.config -ExcludeVersion -OutputDirectory tools
- ${{ if ne(parameters.MonoVersion, '') }}:
- script: |
curl -o mono.pkg https://download.mono-project.com/archive/$MONO_VERSION/macos-10-universal/MonoFramework-MDK-$MONO_VERSION.182.macos10.xamarin.universal.pkg
sudo installer -pkg mono.pkg -target /
sudo cp -rf /Library/Frameworks/Mono.framework/Versions/$MONO_VERSION/ /Library/Frameworks/Mono.framework/Versions/Current/
MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$MONO_VERSION
echo "##vso[task.setvariable variable=DYLD_FALLBACK_LIBRARY_PATH;]$MONOPREFIX/lib:/lib:/usr/lib:$DYLD_LIBRARY_FALLBACK_PATH"
echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH"
env:
MONO_VERSION: ${{ parameters.MonoVersion }}
displayName: Use Mono ${{ parameters.MonoVersion }}
failOnStderr: false
- script: |
curl -o mono.pkg https://download.mono-project.com/archive/$MONO_VERSION/macos-10-universal/MonoFramework-MDK-$MONO_VERSION.182.macos10.xamarin.universal.pkg
sudo installer -pkg mono.pkg -target /
sudo cp -rf /Library/Frameworks/Mono.framework/Versions/$MONO_VERSION/ /Library/Frameworks/Mono.framework/Versions/Current/
MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/$MONO_VERSION
echo "##vso[task.setvariable variable=DYLD_FALLBACK_LIBRARY_PATH;]$MONOPREFIX/lib:/lib:/usr/lib:$DYLD_LIBRARY_FALLBACK_PATH"
echo "##vso[task.setvariable variable=PKG_CONFIG_PATH;]$MONOPREFIX/lib/pkgconfig:$MONOPREFIX/share/pkgconfig:$PKG_CONFIG_PATH"
echo "##vso[task.setvariable variable=PATH;]$MONOPREFIX/bin:$PATH"
env:
MONO_VERSION: ${{ parameters.MonoVersion }}
displayName: Use Mono ${{ parameters.MonoVersion }}
failOnStderr: false
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
# Changelog
All changes to the project will be documented in this file.

## [1.39.12] - 2024-07-26
* Update .NET SDKs (PR: [#2621](https://github.com/OmniSharp/omnisharp-roslyn/pull/2621))
* Update Roslyn to 4.12.0-1.24358.3 (PR: [#2619](https://github.com/OmniSharp/omnisharp-roslyn/pull/2619))
* Fix code fix construction (PR: [#2620](https://github.com/OmniSharp/omnisharp-roslyn/pull/2620))
* Remove NuGet.Packaging.Core, as it's an assembly that only contains forwarders (PR: [#2610](https://github.com/OmniSharp/omnisharp-roslyn/pull/2610))
* Fix inlay hints lambdas parameter type null reference exception (PR: [#2604](https://github.com/OmniSharp/omnisharp-roslyn/pull/2604))
* Update SDKs and Roslyn (PR: [#2603](https://github.com/OmniSharp/omnisharp-roslyn/pull/2603))
* Pass project path when performing a restore (PR: [#2593](https://github.com/OmniSharp/omnisharp-roslyn/pull/2593))

## [1.39.11] - 2023-12-19
* Update changelog (PR: [#2591](https://github.com/OmniSharp/omnisharp-roslyn/pull/2591))
* Update Readme text and fix broken link. ([#2581](https://github.com/OmniSharp/omnisharp-roslyn/issues/2581), PR: [#2582](https://github.com/OmniSharp/omnisharp-roslyn/pull/2582))
* Update SDKs and dependencies ([#2586](https://github.com/OmniSharp/omnisharp-roslyn/issues/2586), PR: [#2588](https://github.com/OmniSharp/omnisharp-roslyn/pull/2588))
* Updated to latest dotnet-script 1.5.0 (PR: [#2585](https://github.com/OmniSharp/omnisharp-roslyn/pull/2585))

## [1.39.10] - 2023-10-05
* Add RazorComplier EA to support razor generators (PR: [#2572](https://github.com/OmniSharp/omnisharp-roslyn/pull/2572))

Expand Down
1 change: 0 additions & 1 deletion Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<PackageReference Include="NuGet.DependencyResolver.Core" ExcludeAssets="all" PrivateAssets="all" />
<PackageReference Include="NuGet.Frameworks" ExcludeAssets="all" PrivateAssets="all" />
<PackageReference Include="NuGet.LibraryModel" ExcludeAssets="all" PrivateAssets="all" />
<PackageReference Include="NuGet.Packaging.Core" ExcludeAssets="all" PrivateAssets="all" />
<PackageReference Include="NuGet.Packaging" ExcludeAssets="all" PrivateAssets="all" />
<PackageReference Include="NuGet.ProjectModel" ExcludeAssets="all" PrivateAssets="all" />
<PackageReference Include="NuGet.Protocol" ExcludeAssets="all" PrivateAssets="all" />
Expand Down
Loading