Skip to content

Commit

Permalink
Upgrade gcc CI to use gcc13 (#86051)
Browse files Browse the repository at this point in the history
* Upgrade gcc CI to use gcc13

* Fix a Wstrict-prototypes
  • Loading branch information
am11 authored May 19, 2023
1 parent e62cb64 commit 558345d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion eng/pipelines/common/platform-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ jobs:
targetRid: linux-x64
platform: linux_x64
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
container: debian-11-gcc12-amd64
container: debian-12-gcc13-amd64
jobParameters:
runtimeFlavor: ${{ parameters.runtimeFlavor }}
buildConfig: ${{ parameters.buildConfig }}
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/common/templates/pipeline-with-resources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ resources:
env:
ROOTFS_DIR: /crossrootfs/riscv64

- container: debian-11-gcc12-amd64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-gcc12-amd64
- container: debian-12-gcc13-amd64
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc13-amd64

- container: linux_x64_llvmaot
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/sgen/sgen-gc.c
Original file line number Diff line number Diff line change
Expand Up @@ -4070,7 +4070,7 @@ guint64 memory_pressure_removes[MEM_PRESSURE_COUNT] = {0, 0, 0, 0}; // history
const unsigned min_memorypressure_budget = 4 * 1024 * 1024; // 4 MB

// Resets pressure accounting after a gen2 GC has occurred.
static void check_pressure_counts ()
static void check_pressure_counts (void)
{
if (memory_pressure_gc_count != sgen_gc_collection_count(GENERATION_OLD)) {
memory_pressure_gc_count = sgen_gc_collection_count(GENERATION_OLD);
Expand Down

0 comments on commit 558345d

Please sign in to comment.