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.

Sign up for GitHub

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

Bring develop history up to date #47

Merged
merged 14 commits into from
Feb 21, 2023
+12 −2
Merged

Bring develop history up to date #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a32f1aa
Merge pull request #23 from XanatosX/develop
XanatosX Jan 25, 2023
7d9aae4
Merge pull request #27 from XanatosX/develop
XanatosX Jan 28, 2023
6d56537
Merge pull request #31 from XanatosX/develop
XanatosX Jan 28, 2023
8fc72a3
Merge pull request #34 from XanatosX/develop
XanatosX Feb 21, 2023
6631a9b
Merge pull request #37 from XanatosX/develop
XanatosX Feb 21, 2023
5d72a09
Add step to move nupkg files to publish folder
XanatosX Feb 21, 2023
0d281dd
Merge pull request #39 from XanatosX/bugfix/fix-live-build
XanatosX Feb 21, 2023
3b54b3f
Fix move command
XanatosX Feb 21, 2023
677ac2c
Merge pull request #42 from XanatosX/bugfix/fix-live-build
XanatosX Feb 21, 2023
d33b8b9
Add missing folder before moving
XanatosX Feb 21, 2023
7e0ba10
Merge pull request #44 from XanatosX/bugfix/fix-live-build
XanatosX Feb 21, 2023
7f78722
Fix nightly
XanatosX Feb 21, 2023
73a0135
Remove debug statements
XanatosX Feb 21, 2023
33420aa
Merge pull request #46 from XanatosX/bugfix/fix-live-build
XanatosX Feb 21, 2023
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
7 changes: 6 additions & 1 deletion .github/workflows/create-live-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,12 @@ jobs:
echo "BUILD_VERSION=${{ GITHUB.REF_NAME }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
}
- name: Pack application
run: dotnet pack -p:PackageOutputPath=${{ env.APPLICATION_PUBLISH_FOLDER }} -p:Version=${{ env.BUILD_VERSION }}
run: dotnet pack -p:PackageOutputPath=publish -p:Version=${{ env.BUILD_VERSION }}
- name: Move nuget to output
run: |
mkdir ${{ env.APPLICATION_PUBLISH_FOLDER }}
mv .\src\IL2CareerToolset\publish\*.nupkg ${{ env.APPLICATION_PUBLISH_FOLDER }}
mv .\src\IL2CareerModel\publish\*.nupkg ${{ env.APPLICATION_PUBLISH_FOLDER }}
- name: Show content for debug
if: ${{ env.DEBUG == 'true' }}
run: ls
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/create-nightly-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,12 @@ jobs:
- name: Restore dependencies
run: dotnet restore
- name: Pack application
run: dotnet pack -o ${{ env.APPLICATION_PUBLISH_FOLDER }} -p:Version=0.0.0
run: dotnet pack -p:PackageOutputPath=publish -p:Version=0.0.0
- name: Move nuget to output
run: |
mkdir ${{ env.APPLICATION_PUBLISH_FOLDER }}
mv .\src\IL2CareerToolset\publish\*.nupkg ${{ env.APPLICATION_PUBLISH_FOLDER }}
mv .\src\IL2CareerModel\publish\*.nupkg ${{ env.APPLICATION_PUBLISH_FOLDER }}
- name: Show content for debug
if: ${{ env.DEBUG == 'true' }}
run: ls
Expand Down
Loading