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

Sync Main #316

Merged
merged 57 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
c2810be
Merge pull request #200 from Project-MONAI/release/0.1.23
neildsouth May 17, 2023
4b53983
Release/0.1.24 (#209)
neildsouth Aug 7, 2023
947c27a
Merge branch 'develop' into main
mocsharp Aug 12, 2023
7b82822
Release/0.1.25 (#214)
mocsharp Aug 16, 2023
a50ae54
Release 0.2.0 (#216)
mocsharp Aug 22, 2023
1b6c66e
Release/0.2.1 (#218)
mocsharp Aug 24, 2023
12cd750
Update GitVersion.yml
mocsharp Aug 24, 2023
1f1c13f
Update GitVersion.yml
mocsharp Aug 24, 2023
01cecc8
Update GitVersion.yml
mocsharp Aug 24, 2023
3e31a26
Release/0.2.1 (#219)
mocsharp Aug 24, 2023
50c561a
Release/0.2.2 (#221)
mocsharp Aug 24, 2023
f40903a
Release/1.0.0 (#222)
mocsharp Aug 24, 2023
9825274
Update GitVersion.yml
mocsharp Aug 24, 2023
30ecc3e
Update GitVersion.yml
mocsharp Aug 24, 2023
6313bd3
Attempt to fix GitVersion versioning by removing next-version
mocsharp Aug 24, 2023
0877434
Release/1.0.1 (#224)
mocsharp Sep 12, 2023
7aea5de
Merge branch 'main' into release/1.0.2
neildsouth Oct 11, 2023
9a839cd
Update IServiceCollectionExtensionsTests.cs
neildsouth Oct 11, 2023
14dd26d
Merge pull request #236 from Project-MONAI/neildsouth-patch-1
neildsouth Oct 11, 2023
e6195b0
Merge pull request #235 from Project-MONAI/release/1.0.2
neildsouth Oct 11, 2023
3adc5c4
Merge pull request #241 from Project-MONAI/release/1.0.3
neildsouth Oct 13, 2023
d41cfbe
adding comment
neildsouth Oct 23, 2023
d4a5f92
Merge pull request #249 from Project-MONAI/hotfix-nds
neildsouth Oct 23, 2023
b087cd7
unify naming
neildsouth Oct 24, 2023
a9c34e6
Merge pull request #250 from Project-MONAI/hotfix-nds
neildsouth Oct 24, 2023
51e6ae7
Merge pull request #248 from Project-MONAI/release/1.0.4
neildsouth Oct 24, 2023
fcb0b80
Merge pull request #263 from Project-MONAI/release/1.0.5
neildsouth Nov 23, 2023
565afc5
Merge pull request #268 from Project-MONAI/release/1.0.6
neildsouth Dec 14, 2023
6fb82bf
Release 2.0.0 (#273)
mocsharp Jan 5, 2024
167b523
Merge branch 'main' into release/2.0.1
neildsouth Jan 31, 2024
71d1769
Merge pull request #291 from Project-MONAI/release/2.0.1
neildsouth Jan 31, 2024
e62dfb9
Update GitVersion.yml
mocsharp Jan 31, 2024
e831756
Update GitVersion.yml
mocsharp Jan 31, 2024
895250d
Update GitVersion.yml
mocsharp Jan 31, 2024
ae8e2b5
Update .gitignore
neildsouth Feb 1, 2024
a984df3
Merge pull request #293 from Project-MONAI/release/2.0.1
neildsouth Feb 1, 2024
33b79ca
+semver: minor
neildsouth Feb 1, 2024
b2219de
Merge pull request #294 from Project-MONAI/release/2.0.1
neildsouth Feb 1, 2024
a347708
+semver: patch
neildsouth Feb 2, 2024
f6e5c85
Update .gitignore to do new release
neildsouth Feb 2, 2024
beed3e1
Merge pull request #295 from Project-MONAI/neildsouth-patch-1
neildsouth Feb 2, 2024
13d03eb
Merge pull request #296 from Project-MONAI/release/2.0.1
neildsouth Feb 2, 2024
a066792
Update .gitignore
neildsouth Feb 2, 2024
4a1ca65
+semver: patch
neildsouth Feb 2, 2024
e9ff61e
+semver: patch version 2.0.1
neildsouth Feb 8, 2024
4ea59bc
Merge branch 'main' into release/2.0.1
neildsouth Feb 8, 2024
5f0a662
change upload action
neildsouth Feb 8, 2024
a213c0a
tweek to download action
neildsouth Feb 8, 2024
7f4e097
Merge pull request #300 from Project-MONAI/hotfix2.0.1
neildsouth Feb 8, 2024
3cdfc79
Merge pull request #299 from Project-MONAI/release/2.0.1
neildsouth Feb 8, 2024
3f06fee
change next version
neildsouth Feb 9, 2024
fbd239b
Merge pull request #301 from Project-MONAI/release/2.0.1
neildsouth Feb 9, 2024
9e6199b
Update dependencies, license and copyrights (#313) (#314)
mocsharp Jun 12, 2024
d403d6c
Update ci.yml
mocsharp Jun 12, 2024
6d7b080
Update gittool to 0.17.0
mocsharp Jun 12, 2024
5375c0b
Fix gitversion version number
mocsharp Jun 12, 2024
c08dcc0
Update ci.yml
mocsharp Jun 12, 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
45 changes: 23 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-dotnet@v3
Expand All @@ -52,15 +52,15 @@ jobs:
tools: licensefinder

- name: Enable NuGet cache
uses: actions/cache@v3.3.2
uses: actions/cache@v4.0.2
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
restore-keys: |
${{ runner.os }}-nuget

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
- name: Initialize CodeQ
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}

Expand All @@ -80,7 +80,7 @@ jobs:
working-directory: ./src

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3

- name: Secret detection
uses: gitleaks/[email protected]
Expand All @@ -95,7 +95,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Set up JDK 17
uses: actions/setup-java@v4
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '17'
Expand All @@ -105,14 +105,14 @@ jobs:
dotnet-version: "8.0.x"

- name: Enable NuGet cache
uses: actions/cache@v3.3.2
uses: actions/cache@v4.0.2
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
restore-keys: |
${{ runner.os }}-nuget

- uses: actions/checkout@v4
- uses: actions/checkout@v3
with:
fetch-depth: 0

Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
fetch-depth: 0

Expand All @@ -198,7 +198,7 @@ jobs:
dotnet-version: "8.0.x"

- name: Enable NuGet cache
uses: actions/cache@v3.3.2
uses: actions/cache@v4.0.2
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
Expand All @@ -214,7 +214,8 @@ jobs:

- name: Determine Version
id: gitversion
uses: gittools/actions/gitversion/[email protected]
uses: gittools/actions/gitversion/[email protected]

with:
useConfigFile: true
updateAssemblyInfo: true
Expand Down Expand Up @@ -242,15 +243,15 @@ jobs:

- name: Upload Nuget
if: ${{ matrix.os == 'ubuntu-latest' }}
uses: actions/upload-artifact@v4.0.0
uses: actions/upload-artifact@v4.3.1
with:
name: nuget
path: ${{ github.workspace }}/release/*.nupkg
retention-days: 30

- name: Upload Zipped Plug-ins
if: ${{ matrix.os == 'ubuntu-latest' }}
uses: actions/upload-artifact@v4.0.0
uses: actions/upload-artifact@v4.3.1
with:
name: plug-ins
path: ${{ github.workspace }}/src/Plugins/release/*.zip
Expand All @@ -262,7 +263,7 @@ jobs:
needs: [build, unit-test]
if: ${{ ! ( github.event.inputs.nuget ) && ! ( contains(github.ref, 'refs/heads/main') ) }}
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
id: download

- name: List artifacts
Expand All @@ -271,7 +272,7 @@ jobs:
- name: Install grp
run: dotnet tool install gpr -g

- uses: actions/setup-dotnet@v3
- uses: actions/setup-dotnet@v4
env:
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
with:
Expand All @@ -287,7 +288,7 @@ jobs:
needs: [build, unit-test]
if: ${{ github.event.inputs.nuget }}
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
id: download

- name: List artifacts
Expand Down Expand Up @@ -315,11 +316,11 @@ jobs:
MAJORMINORPATCH: ${{ needs.build.outputs.majorMinorPatch }}

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v3
with:
fetch-depth: 0

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
id: download

- name: List artifacts
Expand All @@ -336,12 +337,12 @@ jobs:
msg: ${{ github.repository }}

- name: Install GitReleaseManager
uses: gittools/actions/gitreleasemanager/setup@v0.10.2
uses: gittools/actions/gitreleasemanager/setup@v0.17.0
with:
versionSpec: "0.13.x"

- name: Create release with GitReleaseManager
uses: gittools/actions/gitreleasemanager/create@v0.10.2
uses: gittools/actions/gitreleasemanager/create@v0.17.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
owner: ${{ steps.repo.outputs._0 }}
Expand All @@ -353,7 +354,7 @@ jobs:

- name: Publish release with GitReleaseManager
if: ${{ contains(github.ref, 'refs/heads/main') }}
uses: gittools/actions/gitreleasemanager/publish@v0.10.2
uses: gittools/actions/gitreleasemanager/publish@v0.17.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
owner: ${{ steps.repo.outputs._0 }}
Expand All @@ -362,7 +363,7 @@ jobs:

- name: Close release with GitReleaseManager
if: ${{ contains(github.ref, 'refs/heads/main') }}
uses: gittools/actions/gitreleasemanager/close@v0.10.2
uses: gittools/actions/gitreleasemanager/close@v0.17.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
owner: ${{ steps.repo.outputs._0 }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -351,4 +351,5 @@ MigrationBackup/
# Ionide (cross platform F# VS Code tools) working folder
.ionide/


*/.idea/*
2 changes: 1 addition & 1 deletion .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ header:
license:
spdx-id: Apache-2.0
copyright-owner: MONAI Consortium

copyright-year: '2021-2024'
paths:
- 'src'

Expand Down
7 changes: 6 additions & 1 deletion GitVersion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,9 @@ branches:
ignore:
sha: []
merge-message-formats: {}
next-version: 0.1.19
next-version: 2.0.0

major-version-bump-message: '\+semver:\s?(breaking|major)'
minor-version-bump-message: '\+semver:\s?(feature|minor)'
patch-version-bump-message: '\+semver:\s?(fix|patch)'
update-build-number: false
Loading
Loading