Skip to content

Update to the 22.04 debpkg image so we're on a newer ubuntu version. #86803

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
merged 5 commits into from
Jun 22, 2023
Merged

Update to the 22.04 debpkg image so we're on a newer ubuntu version. #86803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34b18e6
Update to the 22.04 debpkg image so we're on a newer ubuntu version.
jkoritzinsky May 26, 2023
db4715e
Clean up extraneous definitions of debpkg and rpmpkg container resources
jkoritzinsky May 26, 2023
e86078d
Ignore LTTNG provider dependencies.
jkoritzinsky May 31, 2023
3f4e330
Merge branch 'main' into new-debpkg
jkoritzinsky Jun 8, 2023
d585130
Merge branch 'main' into new-debpkg
jkoritzinsky Jun 22, 2023
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
2 changes: 1 addition & 1 deletion eng/pipelines/common/templates/pipeline-with-resources.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ resources:
ROOTFS_DIR: /crossrootfs/armel

- container: debpkg
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-debpkg
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg

- container: rpmpkg
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
Expand Down
8 changes: 0 additions & 8 deletions eng/pipelines/runtimelab.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,6 @@ pr:
- PATENTS.TXT
- THIRD-PARTY-NOTICES.TXT

resources:
containers:
# Define auxilary containers used by the installer jobs
- container: debpkg
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-debpkg
- container: rpmpkg
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg

variables:
- template: /eng/pipelines/common/variables.yml
- ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down
2 changes: 2 additions & 0 deletions src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
<Target Name="AddLinuxPackageInformation" BeforeTargets="GetDebInstallerJsonProperties;GetRpmInstallerJsonProperties">
<ItemGroup>
<LinuxPackageDependency Include="dotnet-hostfxr-$(MajorVersion).$(MinorVersion);dotnet-runtime-deps-$(MajorVersion).$(MinorVersion)" Version="$(InstallerPackageVersion)" />
<!-- We build on an image with LTTNGv0, but we package on distros that have v1. Ignore inspecting dependencies on our LLTNG provider to ensure we can package. -->
<DebJsonProperty Include="debian_ignored_libraries" Object="[&quot;libcoreclrtraceptprovider.so&quot;]" />
</ItemGroup>
</Target>

Expand Down