Skip to content

Commit

Permalink
Remove appveyor
Browse files Browse the repository at this point in the history
  • Loading branch information
baynezy committed Dec 7, 2023
1 parent f0eabf7 commit 4a57ad7
Show file tree
Hide file tree
Showing 14 changed files with 77 additions and 118 deletions.
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,11 @@ updates:
interval: "daily"
labels:
- "dependencies"
open-pull-requests-limit: 10

- package-ecosystem: "github-actions"
directory: "/" # Location of package manifests
schedule:
interval: "daily"
labels:
- "dependencies"
1 change: 0 additions & 1 deletion .github/workflows/branch-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ on:
- 'test/**'
- '**.sln'
- '**.cake'
- 'nuget.config'
- '.github/workflows/branch-develop.yml'
- '.github/workflows/step-*.yml'
workflow_dispatch:
Expand Down
15 changes: 5 additions & 10 deletions .github/workflows/branch-feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ on:
- 'test/**'
- '**.sln'
- '**.cake'
- 'nuget.config'
- '.github/workflows/branch-feature.yml'
- '.github/workflows/step-*.yml'
workflow_dispatch:
Expand All @@ -30,12 +29,8 @@ jobs:
with:
version: ${{ needs.get-version.outputs.version }}
checkout-ref: ${{ github.head_ref }}

deploy:
needs: [build]
uses: ./.github/workflows/step-deploy.yml
secrets: inherit
with:
deploy-env: dev
deploy-branch: ${{ github.head_ref }}
version: ${{ needs.get-version.outputs.version }}

check-markdown:
needs: [get-version]
uses: ./.github/workflows/step-check-markdown.yml
secrets: inherit
12 changes: 6 additions & 6 deletions .github/workflows/branch-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,31 @@ jobs:
version: ${{ needs.get-version.outputs.version }}
checkout-ref: ${{ github.base_ref }}

deploy-to-production:
publish-to-nuget:
needs: [get-version,build]
uses: ./.github/workflows/step-deploy.yml
uses: ./.github/workflows/step-publish.yml
secrets: inherit
with:
deploy-env: production
deploy-env: nuget
deploy-branch: ${{ github.base_ref }}
version: ${{ needs.get-version.outputs.version }}

tag-release:
needs: [get-version,deploy-to-production]
needs: [get-version,publish-to-nuget]
uses: ./.github/workflows/step-tag-release.yml
with:
version: ${{ needs.get-version.outputs.version }}

merge-master-to-develop:
needs: [deploy-to-production]
needs: [publish-to-nuget]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Create Pull Request
env:
GH_TOKEN: ${{ secrets.CREATE_PR_TOKEN }}
run: |
echo -e "This PR merges the master branch back into develop.\nThis happens to ensure that the updates that happend on the release branch, i.e. CHANGELOG updates are also present on the develop branch." > msg.txt
echo -e "This PR merges the master branch back into develop.\nThis happens to ensure that the updates that happened on the release branch, i.e. CHANGELOG updates are also present on the develop branch." > msg.txt
export msg=$(cat msg.txt) ; gh pr create \
--head master \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/branch-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ on:
- 'test/**'
- '**.sln'
- '**.cake'
- 'nuget.config'
- '.github/workflows/branch-release.yml'
- '.github/workflows/step-*.yml'
workflow_dispatch:
Expand Down
38 changes: 8 additions & 30 deletions .github/workflows/step-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,64 +17,42 @@ jobs:
- name: Log Branch
run: |
echo "Branch: ${{ inputs.checkout-ref }}"
- name: Configure AWS CLI
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: eu-west-2
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ inputs.checkout-ref }}
- name: Setup .NET Core
uses: actions/[email protected]
with:
dotnet-version: 7.0.x
- name: Login to AWS CodeArtifact
run: |
aws codeartifact login --tool dotnet --repository ${{ secrets.AWS_CODEARTIFACT_REPOSITORY }} --domain ${{ secrets.AWS_CODEARTIFACT_DOMAIN }} --domain-owner ${{ secrets.AWS_CODEARTIFACT_ACCOUNT_NUMBER }}
dotnet-version: 8.0.x
- name: Restore
uses: cake-build/cake-action@v1
with:
target: Restore
- name: Build
uses: cake-build/cake-action@v1
with:
target: Build-CI
target: Build
arguments: |
versionNumber: ${{inputs.version}}
- name: Run tests
uses: cake-build/cake-action@v1
with:
target: Test-CI
target: Test
- name: Publish Unit Test Results
if: ${{ github.actor != 'dependabot[bot]' }}
uses: EnricoMi/publish-unit-test-result-action/composite@v2
with:
files: "**/TestResults/*.xml"
- name: Build NuGet Package - AfterLife.Domain
- name: Build NuGet Package
uses: cake-build/cake-action@v1
with:
target: Pack-CI
target: Pack
arguments: |
versionNumber: ${{inputs.version}}
- name: Build NuGet Package - AfterLife.Domain.Fixtures
uses: cake-build/cake-action@v1
with:
target: Pack-CI
arguments: |
projectName: AfterLife.Domain.Fixtures
versionNumber: ${{inputs.version}}
- name: Upload Package - AfterLife.Domain
if: ${{ github.actor != 'dependabot[bot]' }}
uses: actions/upload-artifact@v3
with:
name: AfterLife.Domain
path: ./nuget-publish/AfterLife.Domain/*.nupkg
- name: Upload Package - AfterLife.Domain.Fixtures
- name: Upload Package
if: ${{ github.actor != 'dependabot[bot]' }}
uses: actions/upload-artifact@v3
with:
name: AfterLife.Domain.Fixtures
path: ./nuget-publish/AfterLife.Domain.Fixtures/*.nupkg
name: Html2Markdown
path: ./src/Html2Markdown/bin/Release/*.nupkg
12 changes: 12 additions & 0 deletions .github/workflows/step-check-markdown.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
on:
workflow_call:

jobs:
check-markdown:
runs-on: ubuntu-latest
steps:
- name: markdownlint-cli
uses: nosborn/[email protected]
with:
files: .
config_file: .markdownlint.json
15 changes: 3 additions & 12 deletions .github/workflows/step-publish-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,11 @@ jobs:
uses: actions/download-artifact@v3
with:
name: ${{ inputs.package-name }}
path: ./nuget-publish
- name: Configure AWS CLI
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: eu-west-2
path: ./src/Html2Markdown/bin/Release
- name: Setup .NET Core
uses: actions/[email protected]
with:
dotnet-version: 7.0.x
- name: Login to AWS CodeArtifact
run: |
aws codeartifact login --tool dotnet --repository ${{ secrets.AWS_CODEARTIFACT_REPOSITORY }} --domain ${{ secrets.AWS_CODEARTIFACT_DOMAIN }} --domain-owner ${{ secrets.AWS_CODEARTIFACT_ACCOUNT_NUMBER }}
dotnet-version: 8.0.x
- name: Push package to NuGet
run: |
dotnet nuget push $(find ./nuget-publish/*.nupkg) --source $(aws codeartifact get-repository-endpoint --repository ${{ secrets.AWS_CODEARTIFACT_REPOSITORY }} --domain ${{ secrets.AWS_CODEARTIFACT_DOMAIN }} --domain-owner ${{ secrets.AWS_CODEARTIFACT_ACCOUNT_NUMBER }} --format nuget --query repositoryEndpoint --output text)v3/index.json
dotnet nuget push $(find ./src/Html2Markdown/bin/Release/*.nupkg) --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,11 @@ on:
type: string

jobs:
publish-package-domain:
publish-package:
uses: ./.github/workflows/step-publish-package.yml
secrets: inherit
with:
deploy-env: ${{ inputs.deploy-env }}
deploy-branch: ${{ inputs.deploy-branch }}
version: ${{ inputs.version }}
package-name: AfterLife.Domain

publish-package-domain-fixtures:
uses: ./.github/workflows/step-publish-package.yml
secrets: inherit
with:
deploy-env: ${{ inputs.deploy-env }}
deploy-branch: ${{ inputs.deploy-branch }}
version: ${{ inputs.version }}
package-name: AfterLife.Domain.Fixtures
package-name: Html2Markdown
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Changelog

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
18 changes: 18 additions & 0 deletions Html2Markdown.sln
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0E30007D-D
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Html2Markdown.Test", "test\Html2Markdown.Test\Html2Markdown.Test.csproj", "{AA6A2578-6242-4A61-BB39-5CE31629694D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CACEF6F3-2E2D-42F7-95D1-8D7FDBEFF56A}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
.gitmessage = .gitmessage
.markdownlint.json = .markdownlint.json
build.cake = build.cake
CHANGELOG.md = CHANGELOG.md
CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
CONTRIBUTING.md = CONTRIBUTING.md
DOCUMENTATION.md = DOCUMENTATION.md
doxygen.config = doxygen.config
ISSUE_TEMPLATE.md = ISSUE_TEMPLATE.md
PULL_REQUEST_TEMPLATE.md = PULL_REQUEST_TEMPLATE.md
pushDocumentation.ps1 = pushDocumentation.ps1
README.md = README.md
semver.json = semver.json
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down
47 changes: 0 additions & 47 deletions appveyor.yml

This file was deleted.

6 changes: 6 additions & 0 deletions semver.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"major": "5",
"minor": "1",
"patch": "0",
"build": "0"
}
1 change: 1 addition & 0 deletions test/Html2Markdown.Test/Html2Markdown.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="JunitXml.TestLogger" Version="3.0.134" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="NUnit" Version="4.0.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
Expand Down

0 comments on commit 4a57ad7

Please sign in to comment.