Skip to content

Commit 9a6c88a

Browse files
colbylwilliamscolbylwilliams
committed
ci updates
1 parent a947f90 commit 9a6c88a

File tree

4 files changed

+41
-26
lines changed

4 files changed

+41
-26
lines changed

‎.github/workflows/ci_packaging.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ jobs:
5050
working-directory: ${{ env.SOURCE_DIRECTORY }}
5151

5252
- name: Publish NuGet Packages to MyGet
53-
run: dotnet nuget push **/*.nupkg --api-key '${{ secrets.MYGET_TOKEN }}' --source 'https://www.myget.org/F/teamcloud-dev/api/v2/package' --symbol-api-key '${{ secrets.MYGET_TOKEN }}' --symbol-source 'https://www.myget.org/F/teamcloud-dev/symbols/api/v2/package' --skip-duplicate
53+
run: dotnet nuget push **/*.nupkg --api-key '${{ secrets.MYGET_DEV_TOKEN }}' --source 'https://www.myget.org/F/teamcloud-dev/api/v2/package' --symbol-api-key '${{ secrets.MYGET_DEV_TOKEN }}' --symbol-source 'https://www.myget.org/F/teamcloud-dev/symbols/api/v2/package' --skip-duplicate

‎.github/workflows/pre_release.yml

+27-10
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,29 @@ jobs:
3939
with:
4040
dotnet-version: '3.1.101'
4141

42-
- name: Build and Package for Release
43-
run: dotnet build -c ${{ env.BUILD_CONFIGURATION }} -p:VersionPrefix="${{ steps.gitversion.outputs.majorMinorPatch }}" -p:AssemblyVersion="${{ steps.gitversion.outputs.assemblySemVer }}" -p:FileVersion="${{ steps.gitversion.outputs.assemblySemFileVer }}" -p:IncludeSymbols=true --version-suffix "pre"
44-
working-directory: ${{ env.SOURCE_DIRECTORY }}
42+
- name: Build & Package for Pre-release
43+
run: dotnet build ${{ env.SOURCE_DIRECTORY }}/TeamCloud.sln -o Prerelease -c ${{ env.BUILD_CONFIGURATION }} -p:VersionPrefix="${{ steps.gitversion.outputs.majorMinorPatch }}" -p:AssemblyVersion="${{ steps.gitversion.outputs.assemblySemVer }}" -p:FileVersion="${{ steps.gitversion.outputs.assemblySemFileVer }}" -p:IncludeSymbols=true --version-suffix "pre"
4544

46-
- name: Publish NuGet Packages
47-
run: dotnet nuget push **/*.nupkg --api-key '${{ secrets.MYGET_TOKEN }}' --source 'https://www.myget.org/F/teamcloud-dev/api/v2/package' --symbol-api-key '${{ secrets.MYGET_TOKEN }}' --symbol-source 'https://www.myget.org/F/teamcloud-dev/symbols/api/v2/package' --skip-duplicate
45+
- name: Publish Pre-release NuGet Packages
46+
run: dotnet nuget push Prerelease/*.nupkg --api-key '${{ secrets.MYGET_TOKEN }}' --source 'https://www.myget.org/F/teamcloud-dev/api/v2/package' --symbol-api-key '${{ secrets.MYGET_TOKEN }}' --symbol-source 'https://www.myget.org/F/teamcloud-dev/symbols/api/v2/package' --skip-duplicate
4847

49-
- name: Build for Release Deployment
50-
id: deployment_build
48+
- name: Build & Package for Release
49+
run: dotnet build ${{ env.SOURCE_DIRECTORY }}/TeamCloud.sln -c ${{ env.BUILD_CONFIGURATION }} -p:VersionPrefix="${{ steps.gitversion.outputs.majorMinorPatch }}" -p:AssemblyVersion="${{ steps.gitversion.outputs.assemblySemVer }}" -p:FileVersion="${{ steps.gitversion.outputs.assemblySemFileVer }}" -p:IncludeSymbols=true
50+
51+
- name: Create NuGet Release Asset
52+
run: zip -r -j NuGet.zip src -i '*.nupkg'
53+
54+
- name: Create TeamCloud.API Release Asset
5155
run: |
52-
dotnet publish ${{ env.SOURCE_DIRECTORY }}/TeamCloud.API/TeamCloud.API.csproj -o TeamCloud.API -c ${{ env.BUILD_CONFIGURATION }} -p:VersionPrefix="${{ steps.gitversion.outputs.majorMinorPatch }}" -p:AssemblyVersion="${{ steps.gitversion.outputs.assemblySemVer }}" -p:FileVersion="${{ steps.gitversion.outputs.assemblySemFileVer }}" -p:IncludeSymbols=true
53-
dotnet publish ${{ env.SOURCE_DIRECTORY }}/TeamCloud.Orchestrator/TeamCloud.Orchestrator.csproj -o TeamCloud.Orchestrator -c ${{ env.BUILD_CONFIGURATION }} -p:VersionPrefix="${{ steps.gitversion.outputs.majorMinorPatch }}" -p:AssemblyVersion="${{ steps.gitversion.outputs.assemblySemVer }}" -p:FileVersion="${{ steps.gitversion.outputs.assemblySemFileVer }}" -p:IncludeSymbols=true
54-
56+
dotnet publish ${{ env.SOURCE_DIRECTORY }}/TeamCloud.API/TeamCloud.API.csproj -o TeamCloud.API -c ${{ env.BUILD_CONFIGURATION }} -p:VersionPrefix="${{ steps.gitversion.outputs.majorMinorPatch }}" -p:AssemblyVersion="${{ steps.gitversion.outputs.assemblySemVer }}" -p:FileVersion="${{ steps.gitversion.outputs.assemblySemFileVer }}" -p:IncludeSymbols=true --no-build
57+
5558
pushd TeamCloud.API
5659
zip -r ../TeamCloud.API.zip *
5760
popd
61+
62+
- name: Create TeamCloud.Orchestrator Release Asset
63+
run: |
64+
dotnet publish ${{ env.SOURCE_DIRECTORY }}/TeamCloud.Orchestrator/TeamCloud.Orchestrator.csproj -o TeamCloud.Orchestrator -c ${{ env.BUILD_CONFIGURATION }} -p:VersionPrefix="${{ steps.gitversion.outputs.majorMinorPatch }}" -p:AssemblyVersion="${{ steps.gitversion.outputs.assemblySemVer }}" -p:FileVersion="${{ steps.gitversion.outputs.assemblySemFileVer }}" -p:IncludeSymbols=true --no-build
5865
5966
pushd TeamCloud.Orchestrator
6067
zip -r ../TeamCloud.Orchestrator.zip *
@@ -70,6 +77,16 @@ jobs:
7077
release_name: 'v${{ steps.gitversion.outputs.majorMinorPatch }}-pre'
7178
body: 'Pre-release build.'
7279
prerelease: true
80+
81+
- name: Upload NuGet Release Assets
82+
uses: actions/upload-release-asset@v1
83+
env:
84+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
85+
with:
86+
upload_url: ${{ steps.create_release.outputs.upload_url }}
87+
asset_path: NuGet.zip
88+
asset_name: NuGet.zip
89+
asset_content_type: application/zip
7390

7491
- name: Upload TeamCloud.API Release Assets
7592
uses: actions/upload-release-asset@v1

‎.github/workflows/promote_release.yml

+13-10
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,25 @@ jobs:
1717

1818
steps:
1919

20-
- name: Checkout Code
21-
uses: actions/checkout@v2
20+
- name: Print stuff
21+
run: echo "${{ github.event.release }}"
22+
23+
# - name: Checkout Code
24+
# uses: actions/checkout@v2
2225
# with:
2326
# fetch-depth: 0
2427

2528
# - name: Checkout Tags
2629
# run: git fetch -t
2730

28-
- name: Setup GitVersion
29-
uses: gittools/actions/gitversion/[email protected]
30-
with:
31-
versionSpec: '5.x'
32-
33-
- name: Execute GitVersion
34-
id: gitversion
35-
uses: gittools/actions/gitversion/[email protected]
31+
# - name: Setup GitVersion
32+
# uses: gittools/actions/gitversion/[email protected]
33+
# with:
34+
# versionSpec: '5.x'
35+
36+
# - name: Execute GitVersion
37+
# id: gitversion
38+
# uses: gittools/actions/gitversion/[email protected]
3639

3740
# - name: Setup .NET Core
3841
# uses: actions/setup-dotnet@v1

‎GitVersion.yml

-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ branches:
66
increment: Patch
77
prevent-increment-of-merged-branch-version: true # When release-2.0.0 is merged into master, we want master to build 2.0.0. If release-2.0.0 is merged into develop we want it to build 2.1.0, this option prevents incrementing after a versioned branch is merged
88
track-merge-target: false # Strategy which will look for tagged merge commits directly off the current branch. For example develop → release/1.0.0 → merge into master and tag 1.0.0. The tag is not on develop, but develop should be version 1.0.0 now.
9-
tags:
10-
regex: ^tags?[/-]
11-
increment: None
12-
source-branches: ['master']
13-
prevent-increment-of-merged-branch-version: true
149
ignore:
1510
sha: []
1611
major-version-bump-message: '\+(bump|semver):\s?(breaking|major)'

0 commit comments

Comments
 (0)