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

feat: move to dotnet 8.0.2 #36

Merged
merged 1 commit into from
Mar 15, 2024
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
8 changes: 1 addition & 7 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,8 @@
"version": 1,
"isRoot": true,
"tools": {
"fake-cli": {
"version": "5.22.0",
"commands": [
"fake"
]
},
"paket": {
"version": "7.0.2",
"version": "8.0.3",
"commands": [
"paket"
]
Expand Down
19 changes: 10 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,17 @@ jobs:

steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4

# needed for Sonar, default is 11 and is decprecated
- name: Set up JDK 17
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'

- name: Cache Paket
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-paket
with:
Expand All @@ -38,9 +39,9 @@ jobs:
shell: bash

- name: Setup .NET Core
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: ${{ secrets.VBR_DOTNET_VERSION }}
dotnet-version: ${{ vars.VBR_DOTNET_VERSION_8 }}

- name: .NET version
shell: bash
Expand All @@ -53,15 +54,15 @@ jobs:
dotnet paket install

- name: Cache SonarCloud packages
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: ~/sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar

- name: Cache SonarCloud scanner
id: cache-sonar-scanner
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: ./.sonar/scanner
key: ${{ runner.os }}-sonar-scanner
Expand All @@ -86,7 +87,7 @@ jobs:
SONAR_TOKEN: ${{ secrets.VBR_SONAR_TOKEN }}
shell: bash
run: |
./.sonar/scanner/dotnet-sonarscanner begin /k:"Informatievlaanderen_basisregisters-ops" /o:"informatievlaanderen" /d:sonar.login="${{ secrets.VBR_SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.dotcover.reportsPaths=dotCover.Output.html > /dev/null 2>&1
./.sonar/scanner/dotnet-sonarscanner begin /k:"Informatievlaanderen_basisregisters-ops" /o:"informatievlaanderen" /d:sonar.token="${{ secrets.VBR_SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.dotcover.reportsPaths=dotCover.Output.html > /dev/null 2>&1

- name: Build
shell: bash
Expand All @@ -103,6 +104,6 @@ jobs:
SONAR_TOKEN: ${{ secrets.VBR_SONAR_TOKEN }}
shell: bash
run: |
./.sonar/scanner/dotnet-sonarscanner end /d:sonar.login="${{ secrets.VBR_SONAR_TOKEN }}" > /dev/null 2>&1
./.sonar/scanner/dotnet-sonarscanner end /d:sonar.token="${{ secrets.VBR_SONAR_TOKEN }}" > /dev/null 2>&1

#removed from end> /dev/null 2>&1
91 changes: 27 additions & 64 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@ jobs:

steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Setup Node.js
uses: actions/[email protected]
uses: actions/setup-node@v4
with:
node-version: '20.x'

- name: Node version
shell: bash
Expand Down Expand Up @@ -80,12 +82,12 @@ jobs:
version: ${{ steps.set-version.outputs.version }}
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Cache NPM
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-npm
with:
Expand All @@ -99,10 +101,12 @@ jobs:
shell: bash

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '20.x'

- name: Setup Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.x'

Expand All @@ -120,21 +124,14 @@ jobs:

- name: Install NPM dependencies
shell: bash
run: npm install --legacy-peer-deps
run: ci

- name: Install Python dependencies
shell: bash
run: |
python -m pip install --upgrade pip
pip install requests markdown argparse

# - name: Download NuGet Ops Web
# uses: actions/download-artifact@v3
# continue-on-error: false
# with:
# name: nuget-Be.Vlaanderen.Basisregisters.Ops.Web-${{ needs.set-release-version.outputs.version }}
# path: dist/nuget/

- name: Run Semantic Release
shell: bash
run: npx semantic-release
Expand All @@ -158,55 +155,21 @@ jobs:
echo RELEASE_VERSION=$(cat semver) >> $GITHUB_ENV
shell: bash

publish_to_nuget:
needs: [ release ]
if: ${{ (github.repository_owner == 'Informatievlaanderen') && (needs.release.outputs.version != 'none') }}
name: Publish to NuGet
runs-on: ubuntu-latest

steps:
- name: Checkout Code
uses: actions/checkout@v3

- name: Setup .NET Core
uses: actions/setup-dotnet@v2
with:
dotnet-version: ${{ secrets.VBR_DOTNET_VERSION }}

- name: .NET version
shell: bash
run: dotnet --info

# - name: Download NuGet package ops-web
# uses: actions/download-artifact@v3
# with:
# name: nuget-Be.Vlaanderen.Basisregisters.Ops.Web-${{ needs.release.outputs.version }}
# path: ~/

# - name: Publish packages to NuGet
# shell: bash
# run: |
# dotnet nuget push ~/Be.Vlaanderen.Basisregisters.Ops.Web.$SEMVER.nupkg --source nuget.org --api-key $NUGET_API_KEY
# env:
# SEMVER: ${{ needs.release.outputs.version }}
# WORKSPACE: ${{ github.workspace }}
# NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}

publish_to_atlassian:
needs: [ release ]
if: ${{ (github.repository_owner == 'Informatievlaanderen') && (needs.release.outputs.version != 'none') }}
name: Publish to Atlassian
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Parse repository name
run: echo REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//") >> $GITHUB_ENV
shell: bash

- name: Cache Paket
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-paket
with:
Expand All @@ -216,15 +179,15 @@ jobs:
${{ runner.os }}-build-${{ env.cache-name }}-

- name: Cache Python
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: cache-pip
with:
path: ~/.cache/pip
key: ${{ runner.os }}-build-${{ env.cache-name }}

- name: Setup Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.x'

Expand Down Expand Up @@ -261,11 +224,11 @@ jobs:
aws-region: ${{ secrets.VBR_AWS_REGION_PRD }}

- name: Login to Amazon ECR
uses: aws-actions/amazon-ecr-login@v1.5.3
uses: aws-actions/amazon-ecr-login@v2

# Download artifact
- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
continue-on-error: false
with:
name: ${{ matrix.image }}-${{ needs.release.outputs.version }}
Expand Down Expand Up @@ -312,11 +275,11 @@ jobs:
aws-region: ${{ secrets.VBR_AWS_REGION_PRD }}

- name: Login to Amazon ECR (Staging)
uses: aws-actions/amazon-ecr-login@v1.5.3
uses: aws-actions/amazon-ecr-login@v2

# Download artifact
- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
continue-on-error: false
with:
name: ${{ matrix.image }}-${{ needs.release.outputs.version }}
Expand Down Expand Up @@ -363,11 +326,11 @@ jobs:
aws-region: ${{ secrets.VBR_AWS_REGION_PRD }}

- name: Login to Amazon ECR (Production)
uses: aws-actions/amazon-ecr-login@v1.5.3
uses: aws-actions/amazon-ecr-login@v2

# Download artifact
- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
continue-on-error: false
with:
name: ${{ matrix.image }}-${{ needs.release.outputs.version }}
Expand Down Expand Up @@ -408,7 +371,7 @@ jobs:
shell: bash

- name: Notify deployment started
uses: slackapi/slack-github-action@v1.23.0
uses: slackapi/slack-github-action@v1.25.0
with:
channel-id: '#team-dinosaur-dev'
slack-message: Deployment of ops-web to test has started
Expand Down Expand Up @@ -462,7 +425,7 @@ jobs:
shell: bash

- name: Notify deployment finished
uses: slackapi/slack-github-action@v1.23.0
uses: slackapi/slack-github-action@v1.25.0
with:
channel-id: '#team-dinosaur-dev'
slack-message: Deployment of ops-web to test has finished
Expand All @@ -484,7 +447,7 @@ jobs:
shell: bash

- name: Notify deployment started
uses: slackapi/slack-github-action@v1.23.0
uses: slackapi/slack-github-action@v1.25.0
with:
channel-id: '#team-dinosaur-dev'
slack-message: Deployment of ops-web to staging has started
Expand Down Expand Up @@ -538,7 +501,7 @@ jobs:
shell: bash

- name: Notify deployment finished
uses: slackapi/slack-github-action@v1.23.0
uses: slackapi/slack-github-action@v1.25.0
with:
channel-id: '#team-dinosaur-dev'
slack-message: Deployment of ops-web to staging has finished
Expand All @@ -560,7 +523,7 @@ jobs:
shell: bash

- name: Notify deployment started
uses: slackapi/slack-github-action@v1.23.0
uses: slackapi/slack-github-action@v1.25.0
with:
channel-id: '#team-dinosaur-dev'
slack-message: Deployment of ops-web to new production has started
Expand Down Expand Up @@ -614,7 +577,7 @@ jobs:
shell: bash

- name: Notify deployment finished
uses: slackapi/slack-github-action@v1.23.0
uses: slackapi/slack-github-action@v1.25.0
with:
channel-id: '#team-dinosaur-dev'
slack-message: Deployment of ops-web to production has finished
Expand Down
2 changes: 0 additions & 2 deletions Ops.sln
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.editorconfig = .editorconfig
.gitattributes = .gitattributes
.gitignore = .gitignore
build.fsx = build.fsx
build.sh = build.sh
package.json = package.json
README.md = README.md
SolutionInfo.cs = SolutionInfo.cs
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ops.Web.Tests", "test\Ops.Web.Tests\Ops.Web.Tests.csproj", "{19EB08BE-7086-47B2-BD56-22E675B86D9F}"
Expand Down
20 changes: 0 additions & 20 deletions SolutionInfo.cs

This file was deleted.

Loading
Loading