Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 15 additions & 8 deletions .github/.gitversion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,29 @@
# See the License for the specific language governing permissions and
# limitations under the License.

next-version: 0.1.5
workflow: GitHubFlow/v1
assembly-versioning-scheme: MajorMinorPatchTag
assembly-file-versioning-scheme: MajorMinorPatchTag
mode: ContinuousDelivery
branches:
main:
tag: ''
label: ''
regex: ^main$
release:
regex: ^release/(?!2022)
tag: rc
label: rc
regex: ^releases?[/-](?<BranchName>.+)
develop:
tag: beta
label: beta
increment: Patch
regex: ^develop$
feature:
tag: alpha.{BranchName}
label: alpha.{BranchName}
regex: ^features?[/-](?<BranchName>.+)
pull-request:
tag: pr

label: pr
increment: Patch
regex: ^(pull|pull\-requests|pr)[/-]

ignore:
sha: []
merge-message-formats: {}
32 changes: 17 additions & 15 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,18 @@ jobs:
security-events: write
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Install GitVersion
run: dotnet tool install --global GitVersion.Tool
- name: Setup GitVersion
uses: gittools/actions/gitversion/[email protected]
with:
versionSpec: '6.0.5'

- name: Determine Version
id: gitversion
uses: gittools/actions/gitversion/execute@v0.10.2
uses: gittools/actions/gitversion/execute@v3.1.11
with:
useConfigFile: true
updateAssemblyInfo: true
Expand Down Expand Up @@ -147,16 +149,16 @@ jobs:
env:
SEMVER: ${{ needs.build-and-deploy.outputs.semVer }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/setup-dotnet@v3
- uses: actions/setup-dotnet@v4
with:
dotnet-version: "8.0.x"

- name: Enable NuGet cache
uses: actions/cache@v4.0.2
uses: actions/cache@v4.2.3
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
Expand Down Expand Up @@ -193,7 +195,7 @@ jobs:
Get-ChildItem ~\release -Recurse

- name: Upload docs
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v4.6.2
with:
name: artifacts
path: ~/release
Expand All @@ -208,11 +210,11 @@ jobs:
MAJORMINORPATCH: ${{ needs.build-and-deploy.outputs.majorMinorPatch }}

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

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

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

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

- name: Create release with GitReleaseManager
uses: gittools/actions/gitreleasemanager/create@v0.10.2
uses: gittools/actions/gitreleasemanager/create@v3.1.11
with:
token: ${{ secrets.GITHUB_TOKEN }}
owner: ${{ steps.repo.outputs._0 }}
Expand All @@ -242,7 +244,7 @@ jobs:
artifacts/mwm-docs-${{ env.SEMVER }}.zip

- name: Publish release with GitReleaseManager
uses: gittools/actions/gitreleasemanager/publish@v0.10.2
uses: gittools/actions/gitreleasemanager/publish@v3.1.11
if: ${{ contains(github.ref, 'refs/heads/main') }}
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -251,7 +253,7 @@ jobs:
tagName: ${{ env.MAJORMINORPATCH }}

- name: Close release with GitReleaseManager
uses: gittools/actions/gitreleasemanager/close@v0.10.2
uses: gittools/actions/gitreleasemanager/close@v3.1.11
if: ${{ contains(github.ref, 'refs/heads/main') }}
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,25 @@ jobs:

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

- name: Install Dotnet
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}

- name: Enable NuGet cache
uses: actions/cache@v4.0.2
uses: actions/cache@v4.2.3
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
uses: github/codeql-action/init@v3
with:
languages: csharp

Expand All @@ -68,4 +68,4 @@ jobs:
working-directory: ./src

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
6 changes: 3 additions & 3 deletions .github/workflows/license-scanning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -40,12 +40,12 @@ jobs:
run: gem install license_finder

- name: Install Dotnet
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}

- name: Enable NuGet cache
uses: actions/cache@v4.0.2
uses: actions/cache@v4.2.3
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
security-events: write
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -42,17 +42,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Install Dotnet
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}

- name: Enable NuGet cache
uses: actions/cache@v4.0.2
uses: actions/cache@v4.2.3
with:
path: ~/.nuget/packages
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
Expand Down
32 changes: 16 additions & 16 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Install Dotnet
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}

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

- name: Archive code coverage results
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v4.6.2
with:
name: code-coverage-reports
path: ./tests/**/coverage.opencover.xml
Expand Down Expand Up @@ -100,20 +100,20 @@ jobs:

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

- name: Install Dotnet
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}

- name: Install LivingDoc CLI
run: dotnet tool install --global SpecFlow.Plus.LivingDoc.CLI

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

- name: Publish report
if: always()
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v4.6.2
with:
name: WorkflowExecutorIntegrationTestReport
path: ./tests/IntegrationTests/WorkflowExecutor.IntegrationTests/bin/Debug/net8.0/LivingDoc.html
Expand Down Expand Up @@ -177,20 +177,20 @@ jobs:

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

- name: Install Dotnet
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}

- name: Install LivingDoc CLI
run: dotnet tool install --global SpecFlow.Plus.LivingDoc.CLI

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

- name: Publish report
if: always()
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v4.6.2
with:
name: TaskManagerIntegrationTestReport
path: ./tests/IntegrationTests/TaskManager.IntegrationTests/bin/Debug/net8.0/LivingDoc.html
Expand All @@ -232,17 +232,17 @@ jobs:
distribution: 'zulu' # Alternative distribution options are available.

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

- name: Install Dotnet
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ env.DOTNET_VERSION }}

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

- name: Download code coverage from unit tests
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: code-coverage-reports

Expand Down
6 changes: 4 additions & 2 deletions CallbackApp.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@

FROM python:3.10-alpine

RUN apk update && apk upgrade
RUN apk add libcom_err=1.47.0-r5
RUN apk update && \
apk upgrade && \
apk add libcom_err=1.47.1-r1 && \
rm -rf /var/cache/apk/*
WORKDIR /app
COPY src/TaskManager/CallbackApp/app.py ./
COPY src/TaskManager/CallbackApp/requirements.txt ./
Expand Down
Loading
Loading