Skip to content

Commit

Permalink
chore(deps): updated to .net 9 (#72)
Browse files Browse the repository at this point in the history
* chore(deps): update dependency ubuntu to v24

* chore(deps): update all non-major dependencies

* chore(deps): update github-actions

* chore(deps): update dependency testcontainers to v4

* chore(deps): update dotnet monorepo to v9

* fix ci

* remove redundancies via src/Directory.Build.props

* dotnet version

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
  • Loading branch information
chgl and renovate[bot] authored Nov 20, 2024
1 parent 5575c56 commit 0f6d6d2
Show file tree
Hide file tree
Showing 11 changed files with 353 additions and 96 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"csharpier": {
"version": "0.29.2",
"version": "0.30.1",
"commands": ["dotnet-csharpier"]
}
}
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ permissions: read-all

jobs:
build:
uses: miracum/.github/.github/workflows/standard-build.yaml@0549971ecda7c7415b7e885117576981b4b54ed2 # v1.12.8
uses: miracum/.github/.github/workflows/standard-build.yaml@3a6d6e823363d6a7b39daaadc24566130bddef38 # v1.12.10
permissions:
contents: write
id-token: write
Expand All @@ -33,13 +33,14 @@ jobs:
test:
needs:
- build
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
# <https://docs.docker.com/storage/containerd/>
# via <https://github.com/docker/setup-buildx-action/issues/257>
- name: Set up containerd image store
shell: bash
run: |
[ -f /etc/docker/daemon.json ] || echo "{}" | sudo tee /etc/docker/daemon.json
jq '. | .+{"features": {"containerd-snapshotter": true}}' /etc/docker/daemon.json > /tmp/docker-daemon-with-containerd.json
sudo mv /tmp/docker-daemon-with-containerd.json /etc/docker/daemon.json
cat /etc/docker/daemon.json
Expand Down Expand Up @@ -71,7 +72,7 @@ jobs:
- name: Install .NET
uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0
with:
dotnet-version: "8.0.x"
dotnet-version: "9.0.x"

- name: Run tests
env:
Expand All @@ -85,7 +86,7 @@ jobs:
docker compose down --volumes --remove-orphans
lint:
uses: miracum/.github/.github/workflows/standard-lint.yaml@0549971ecda7c7415b7e885117576981b4b54ed2 # v1.12.8
uses: miracum/.github/.github/workflows/standard-lint.yaml@3a6d6e823363d6a7b39daaadc24566130bddef38 # v1.12.10
permissions:
contents: read
pull-requests: write
Expand All @@ -101,7 +102,7 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}

release:
uses: miracum/.github/.github/workflows/standard-release.yaml@0549971ecda7c7415b7e885117576981b4b54ed2 # v1.12.8
uses: miracum/.github/.github/workflows/standard-release.yaml@3a6d6e823363d6a7b39daaadc24566130bddef38 # v1.12.10
needs:
- build
permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schedule.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions: read-all

jobs:
schedule:
uses: miracum/.github/.github/workflows/standard-schedule.yaml@0549971ecda7c7415b7e885117576981b4b54ed2 # v1.12.8
uses: miracum/.github/.github/workflows/standard-schedule.yaml@3a6d6e823363d6a7b39daaadc24566130bddef38 # v1.12.10
permissions:
contents: read
issues: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
with:
sarif_file: results.sarif
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.403-noble@sha256:363fb696f1d3b48c2342e08aca3e6286c55b844dbd6865ccf79f54b588076737 AS build
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0.100-noble@sha256:3bdd7f7fd595373d049c724f3a05ec8a8d9e27da05ba9cbe3ca6e0f3cc001e50 AS build
WORKDIR /build
ENV DOTNET_CLI_TELEMETRY_OPTOUT=1

COPY src/PathlingS3Import/PathlingS3Import.csproj .
COPY src/PathlingS3Import/packages.lock.json .
COPY src/Directory.Build.props .

RUN --mount=type=cache,id=nuget,target=/root/.nuget/packages dotnet restore --locked-mode
COPY . .
Expand All @@ -15,7 +16,7 @@ RUN --mount=type=cache,id=nuget,target=/root/.nuget/packages dotnet publish \
-o /build/publish \
src/PathlingS3Import/PathlingS3Import.csproj

FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/runtime:8.0.10-noble-chiseled@sha256:90d9976fab6cb55a44516c695ab34dbca3cf1de0011ac971301fd5e90b016fa1
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/runtime:9.0.0-noble-chiseled@sha256:29943341fb6216992c659c352e716c18f8dd973b1575bfda709cf314e60f2d2e
WORKDIR /opt/pathling-s3-import
USER 65534:65534
ENV DOTNET_ENVIRONMENT="Production" \
Expand Down
4 changes: 2 additions & 2 deletions compose.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
minio:
image: docker.io/bitnami/minio:2024.10.29-debian-12-r1@sha256:d07cf144fe42fd6d49bc4757e5562baa92407157626e4ffebbeb02e03c716268
image: docker.io/bitnami/minio:2024.11.7-debian-12-r1@sha256:9f2d9c45006a2ada1bc485e1393291ce7d54ae1a46260dd491381a4eb8b2fd47
environment:
MINIO_ROOT_USER: "admin"
# kics-scan ignore-line
Expand Down Expand Up @@ -29,7 +29,7 @@ services:
condition: service_started

minio-client:
image: docker.io/bitnami/minio-client:2024.10.29-debian-12-r1@sha256:1c5679c3cea6ecd4b264e6ff44a4a7f2884f7546744a2d494e2b663c77e1852c
image: docker.io/bitnami/minio-client:2024.11.17-debian-12-r0@sha256:60f0ebd9dbcec327909fd8832503fa269445c499548a8999ad957046a9ebbea8
environment:
MINIO_SERVER_ACCESS_KEY: admin
# kics-scan ignore-line
Expand Down
22 changes: 22 additions & 0 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<Project>
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<AnalysisLevel>latest</AnalysisLevel>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<Company>miracum.org</Company>
<Description>Tool for importing ndjson files from object storage buckets to a Pathling
server.</Description>
<Copyright>© miracum.org. All rights reserved.</Copyright>
<NeutralLanguage>en-US</NeutralLanguage>
<Authors>miracum.org</Authors>
</PropertyGroup>

<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>
</Project>
12 changes: 4 additions & 8 deletions src/PathlingS3Import.Tests.E2E/PathlingS3Import.Tests.E2E.csproj
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.2" />
<PackageReference Include="FluentAssertions" Version="6.12.1" />
<PackageReference Include="Hl7.Fhir.R4" Version="5.10.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Testcontainers" Version="3.10.0" />
<PackageReference Include="FluentAssertions" Version="6.12.2" />
<PackageReference Include="Hl7.Fhir.R4" Version="5.11.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Testcontainers" Version="4.0.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
</ItemGroup>
Expand Down
Loading

0 comments on commit 0f6d6d2

Please sign in to comment.