Skip to content

Updating to LLVM v18.1 #224

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.

Sign up for GitHub

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

Merged
tannergooding merged 7 commits into from
Apr 30, 2024
Merged

Updating to LLVM v18.1 #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
caa797a
Updating packages to their latest versions
tannergooding Apr 29, 2024
9310f9d
Fixing various tests to work with NUnit 4.1
tannergooding Apr 29, 2024
3845a2b
Minor additional code cleanup
tannergooding Apr 29, 2024
6aa85f6
Updating version information to v18.1
tannergooding Apr 29, 2024
2ddb081
Regenerating bindings for LLVM v18.1
tannergooding Apr 29, 2024
d2afc3a
Use v4 of the various GitHub actions
tannergooding Apr 30, 2024
e13acda
Fix the libLLVM packages for Windows
tannergooding Apr 30, 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
44 changes: 22 additions & 22 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
configuration: [ debug, release ]
os: [ windows ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: ./scripts/cibuild.cmd -configuration ${{ matrix.configuration }} -architecture ${{ matrix.architecture }}
shell: cmd
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ matrix.os }}_${{ matrix.configuration }}_${{ matrix.architecture }}
path: |
Expand All @@ -36,10 +36,10 @@ jobs:
configuration: [ debug, release ]
os: [ ubuntu ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: ./scripts/cibuild.sh --configuration ${{ matrix.configuration }} --architecture ${{ matrix.architecture }}
shell: bash
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ matrix.os }}_${{ matrix.configuration }}_${{ matrix.architecture }}
path: |
Expand All @@ -56,10 +56,10 @@ jobs:
configuration: [ debug, release ]
os: [ macos ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: ./scripts/cibuild.sh --configuration ${{ matrix.configuration }} --architecture ${{ matrix.architecture }}
shell: bash
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ matrix.os }}_${{ matrix.configuration }}_${{ matrix.architecture }}
path: |
Expand All @@ -71,13 +71,13 @@ jobs:
build-nuget-preview:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: ./scripts/cibuild.cmd -configuration release -architecture x64
shell: cmd
env:
EXCLUDE_RUN_ID_FROM_PACKAGE: true
EXCLUDE_SUFFIX_FROM_VERSION: false
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: nuget_preview
path: |
Expand All @@ -93,17 +93,17 @@ jobs:
permissions:
id-token: write
steps:
- uses: actions/checkout@v3
- uses: actions/download-artifact@v3
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: nuget_preview
path: ./artifacts
- uses: actions/setup-dotnet@v3
- uses: actions/setup-dotnet@v4
with:
global-json-file: ./global.json
- run: dotnet tool install --tool-path ./artifacts/tools sign --version 0.9.1-beta.24170.3
- run: ./artifacts/tools/sign code azure-key-vault "**/*.nupkg" --timestamp-url "http://timestamp.digicert.com" --base-directory "${{ github.workspace }}/artifacts/pkg" --file-list "${{ github.workspace }}/scripts/SignClientFileList.txt" --publisher-name ".NET Foundation" --description "LLVMSharp" --description-url "https://github.com/dotnet/llvmsharp" --azure-key-vault-certificate "${{ secrets.SC_KEY_VAULT_CERTIFICATE_ID }}" --azure-key-vault-client-id "${{ secrets.SC_AZURE_CLIENT_ID }}" --azure-key-vault-client-secret "${{ secrets.SC_AZURE_CLIENT_SECRET }}" --azure-key-vault-tenant-id "${{ secrets.SC_AZURE_TENANT_ID }}" --azure-key-vault-url "${{ secrets.SC_KEY_VAULT_URL }}"
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: sign_nuget_preview
path: |
Expand All @@ -112,13 +112,13 @@ jobs:
build-nuget-release:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: ./scripts/cibuild.cmd -configuration release -architecture x64
shell: cmd
env:
EXCLUDE_RUN_ID_FROM_PACKAGE: true
EXCLUDE_SUFFIX_FROM_VERSION: true
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: nuget_release
path: |
Expand All @@ -134,17 +134,17 @@ jobs:
permissions:
id-token: write
steps:
- uses: actions/checkout@v3
- uses: actions/download-artifact@v3
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: nuget_release
path: ./artifacts
- uses: actions/setup-dotnet@v3
- uses: actions/setup-dotnet@v4
with:
global-json-file: ./global.json
- run: dotnet tool install --tool-path ./artifacts/tools sign --version 0.9.1-beta.24170.3
- run: ./artifacts/tools/sign code azure-key-vault "**/*.nupkg" --timestamp-url "http://timestamp.digicert.com" --base-directory "${{ github.workspace }}/artifacts/pkg" --file-list "${{ github.workspace }}/scripts/SignClientFileList.txt" --publisher-name ".NET Foundation" --description "LLVMSharp" --description-url "https://github.com/dotnet/llvmsharp" --azure-key-vault-certificate "${{ secrets.SC_KEY_VAULT_CERTIFICATE_ID }}" --azure-key-vault-client-id "${{ secrets.SC_AZURE_CLIENT_ID }}" --azure-key-vault-client-secret "${{ secrets.SC_AZURE_CLIENT_SECRET }}" --azure-key-vault-tenant-id "${{ secrets.SC_AZURE_TENANT_ID }}" --azure-key-vault-url "${{ secrets.SC_KEY_VAULT_URL }}"
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: sign_nuget_release
path: |
Expand All @@ -155,11 +155,11 @@ jobs:
if: ${{ github.event_name == 'push' }}
needs: [ windows-x64, linux-x64, macos-x64, sign-nuget-preview, sign-nuget-release ]
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: windows_release_x64
path: ./artifacts
- uses: actions/setup-dotnet@v3
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
source-url: https://pkgs.clangsharp.dev/index.json
Expand All @@ -171,11 +171,11 @@ jobs:
if: false
needs: [ windows-x64, linux-x64, macos-x64, sign-nuget-preview, sign-nuget-release ]
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: windows_release_x64
path: ./artifacts
- uses: actions/setup-dotnet@v3
- uses: actions/setup-dotnet@v4
with:
dotnet-version: '8.0.x'
- run: dotnet nuget push "./artifacts/pkg/Release/*.nupkg" --source https://nuget.pkg.github.com/dotnet/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<PackageValidationBaselineVersion>16.0.0</PackageValidationBaselineVersion>
<Product>LLVMSharp</Product>
<RootNamespace>LLVMSharp</RootNamespace>
<VersionPrefix>16.0.0</VersionPrefix>
<VersionPrefix>18.1.0</VersionPrefix>
<VersionSuffix Condition="'$(EXCLUDE_SUFFIX_FROM_VERSION)' != 'true'">rc1</VersionSuffix>
<VersionSuffix Condition="'$(GITHUB_EVENT_NAME)' == 'pull_request'">pr</VersionSuffix>
</PropertyGroup>
Expand Down
9 changes: 3 additions & 6 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,10 @@

<!-- Package versions for package references across all projects -->
<ItemGroup>
<PackageVersion Include="libLLVM" Version="16.0.6" />
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageVersion Include="NUnit" Version="3.13.3" />
<PackageVersion Include="libLLVM" Version="18.1.3.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="NUnit" Version="4.1.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageVersion Include="System.Memory" Version="4.5.5" />
</ItemGroup>

</Project>
6 changes: 0 additions & 6 deletions LLVMSharp.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.win-x64", "
packages\libLLVM\libLLVM.runtime.win-x64\libLLVM.runtime.win-x64.nuspec = packages\libLLVM\libLLVM.runtime.win-x64\libLLVM.runtime.win-x64.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.win-x86", "libLLVM.runtime.win-x86", "{540AB7F4-29FD-462A-8791-259764FD4950}"
ProjectSection(SolutionItems) = preProject
packages\libLLVM\libLLVM.runtime.win-x86\libLLVM.runtime.win-x86.nuspec = packages\libLLVM\libLLVM.runtime.win-x86\libLLVM.runtime.win-x86.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.win-arm64", "libLLVM.runtime.win-arm64", "{19DB05E9-59B6-45E9-B47D-62913F7DF9A8}"
ProjectSection(SolutionItems) = preProject
packages\libLLVM\libLLVM.runtime.win-arm64\libLLVM.runtime.win-arm64.nuspec = packages\libLLVM\libLLVM.runtime.win-arm64\libLLVM.runtime.win-arm64.nuspec
Expand Down Expand Up @@ -140,7 +135,6 @@ Global
{16539CB8-8AC7-4AD0-9D54-8EE615B2FCF3} = {9D46FF1C-E09F-4063-A97D-C09F26310B67}
{D4550E5E-9485-4480-B2B6-9503EEC935BF} = {9D46FF1C-E09F-4063-A97D-C09F26310B67}
{E785DDD0-B9CD-4412-8A3C-4E65C601168C} = {9D46FF1C-E09F-4063-A97D-C09F26310B67}
{540AB7F4-29FD-462A-8791-259764FD4950} = {9D46FF1C-E09F-4063-A97D-C09F26310B67}
{19DB05E9-59B6-45E9-B47D-62913F7DF9A8} = {9D46FF1C-E09F-4063-A97D-C09F26310B67}
{CEA0F0C9-DF25-446B-8F55-FB629BD1D3E6} = {62B5C536-C224-4EE1-972F-05F732B5980B}
{706334B8-BB91-49A4-BC9C-DFFDF3DCD770} = {E8ADE5A7-4363-43B7-B104-6B0E5510CAF0}
Expand Down
4 changes: 2 additions & 2 deletions packages/libLLVM/libLLVM.runtime.linux-arm64/libLLVM.runtime.linux-arm64.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libLLVM.runtime.linux-arm64</id>
<version>16.0.6</version>
<version>18.1.3</version>
<authors>.NET Foundation and Contributors</authors>
<owners>.NET Foundation and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
<projectUrl>https://github.com/dotnet/llvmsharp</projectUrl>
<description>linux arm64 native library for libLLVM.</description>
<copyright>Copyright © LLVM Project</copyright>
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-16.0.6" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
</metadata>
<files>
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
Expand Down
4 changes: 2 additions & 2 deletions packages/libLLVM/libLLVM.runtime.linux-x64/libLLVM.runtime.linux-x64.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libLLVM.runtime.linux-x64</id>
<version>16.0.6</version>
<version>18.1.3</version>
<authors>.NET Foundation and Contributors</authors>
<owners>.NET Foundation and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
<projectUrl>https://github.com/dotnet/llvmsharp</projectUrl>
<description>linux x64 native library for libLLVM.</description>
<copyright>Copyright © LLVM Project</copyright>
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-16.0.6" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
</metadata>
<files>
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
Expand Down
4 changes: 2 additions & 2 deletions packages/libLLVM/libLLVM.runtime.osx-arm64/libLLVM.runtime.osx-arm64.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libLLVM.runtime.osx-arm64</id>
<version>16.0.6</version>
<version>18.1.3</version>
<authors>.NET Foundation and Contributors</authors>
<owners>.NET Foundation and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
<projectUrl>https://github.com/dotnet/llvmsharp</projectUrl>
<description>osx arm64 native library for libLLVM.</description>
<copyright>Copyright © LLVM Project</copyright>
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-16.0.6" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
</metadata>
<files>
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
Expand Down
4 changes: 2 additions & 2 deletions packages/libLLVM/libLLVM.runtime.osx-x64/libLLVM.runtime.osx-x64.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libLLVM.runtime.osx-x64</id>
<version>16.0.6</version>
<version>18.1.3</version>
<authors>.NET Foundation and Contributors</authors>
<owners>.NET Foundation and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
<projectUrl>https://github.com/dotnet/llvmsharp</projectUrl>
<description>osx x64 native library for libLLVM.</description>
<copyright>Copyright © LLVM Project</copyright>
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-16.0.6" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
</metadata>
<files>
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
Expand Down
4 changes: 2 additions & 2 deletions packages/libLLVM/libLLVM.runtime.win-arm64/libLLVM.runtime.win-arm64.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libLLVM.runtime.win-arm64</id>
<version>16.0.6</version>
<version>18.1.3.1</version>
<authors>.NET Foundation and Contributors</authors>
<owners>.NET Foundation and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
<projectUrl>https://github.com/dotnet/llvmsharp</projectUrl>
<description>win arm64 native library for libLLVM.</description>
<copyright>Copyright © LLVM Project</copyright>
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-16.0.6" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
</metadata>
<files>
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
Expand Down
4 changes: 2 additions & 2 deletions packages/libLLVM/libLLVM.runtime.win-x64/libLLVM.runtime.win-x64.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libLLVM.runtime.win-x64</id>
<version>16.0.6</version>
<version>18.1.3.1</version>
<authors>.NET Foundation and Contributors</authors>
<owners>.NET Foundation and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
<projectUrl>https://github.com/dotnet/llvmsharp</projectUrl>
<description>win x64 native library for libLLVM.</description>
<copyright>Copyright © LLVM Project</copyright>
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-16.0.6" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
</metadata>
<files>
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
Expand Down
19 changes: 0 additions & 19 deletions packages/libLLVM/libLLVM.runtime.win-x86/libLLVM.runtime.win-x86.nuspec
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions packages/libLLVM/libLLVM/libLLVM.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libLLVM</id>
<version>16.0.6</version>
<version>18.1.3.1</version>
<authors>.NET Foundation and Contributors</authors>
<owners>.NET Foundation and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
<projectUrl>https://github.com/dotnet/llvmsharp</projectUrl>
<description>Multi-platform native library for libLLVM.</description>
<copyright>Copyright © LLVM Project</copyright>
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-16.0.6" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
<dependencies>
<group targetFramework=".NETStandard2.0" />
</dependencies>
Expand Down
17 changes: 6 additions & 11 deletions packages/libLLVM/libLLVM/runtime.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,32 @@
"runtimes": {
"linux-arm64": {
"libLLVM": {
"libLLVM.runtime.linux-arm64": "16.0.6"
"libLLVM.runtime.linux-arm64": "18.1.3"
}
},
"linux-x64": {
"libLLVM": {
"libLLVM.runtime.linux-x64": "16.0.6"
"libLLVM.runtime.linux-x64": "18.1.3"
}
},
"osx-arm64": {
"libLLVM": {
"libLLVM.runtime.osx-arm64": "16.0.6"
"libLLVM.runtime.osx-arm64": "18.1.3"
}
},
"osx-x64": {
"libLLVM": {
"libLLVM.runtime.osx-x64": "16.0.6"
"libLLVM.runtime.osx-x64": "18.1.3"
}
},
"win-arm64": {
"libLLVM": {
"libLLVM.runtime.win-arm64": "16.0.6"
"libLLVM.runtime.win-arm64": "18.1.3.1"
}
},
"win-x64": {
"libLLVM": {
"libLLVM.runtime.win-x64": "16.0.6"
}
},
"win-x86": {
"libLLVM": {
"libLLVM.runtime.win-x86": "16.0.6"
"libLLVM.runtime.win-x64": "18.1.3.1"
}
}
}
Expand Down
Loading