Skip to content

Commit

Permalink
Merge pull request #697 from gordon-cs/staging
Browse files Browse the repository at this point in the history
Release: API Upgrade, Alumni Profile Update
  • Loading branch information
EjPlatzer authored Aug 17, 2022
2 parents fe652cc + 3649d7f commit 2900eef
Show file tree
Hide file tree
Showing 531 changed files with 18,353 additions and 45,703 deletions.
50 changes: 12 additions & 38 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,45 +3,19 @@ name: CI
on: push

jobs:
ci:
runs-on: windows-2019
ci:
runs-on: windows-latest

steps:
- uses: actions/checkout@v2
steps:
- uses: actions/checkout@v2

- name: Setup msbuild
uses: microsoft/setup-msbuild@v1
- name: Setup .NET Core SDK 6
uses: actions/setup-dotnet@v2
with:
dotnet-version: '6.0.x'

- name: Setup NuGet
uses: NuGet/[email protected]
- name: Install dependencies
run: dotnet restore

- name: Restore NuGet packages
run: nuget restore Gordon360.sln

- name: Build API
run: msbuild .\Gordon360\Gordon360.csproj /p:DeployOnBuild=True /p:PublishProfile=${{ github.workspace }}\gha-publish-profiles\CI.pubxml

# Uncomment to enable test builds. Works in concert with the `Deploy 360Test` Scheduled Task on 360API.gordon.edu VM
# - name: Upload Test Build Artifact
# uses: actions/[email protected]
# if: ${{ github.refs != 'refs/heads/develop' && github.refs != 'refs/heads/master' }}
# with:
# name: build-Test
# path: ${{ github.workspace }}\Gordon360\bin\app.publish\ci
# if-no-files-found: warn

- name: Upload Train Build Artifact
uses: actions/[email protected]
if: ${{ github.ref == 'refs/heads/develop' }}
with:
name: build-Train
path: ${{ github.workspace }}\Gordon360\bin\app.publish\ci
if-no-files-found: error

- name: Upload Prod Build Artifact
uses: actions/[email protected]
if: ${{ github.ref == 'refs/heads/master' }}
with:
name: build-Prod
path: ${{ github.workspace }}\Gordon360\bin\app.publish\ci
if-no-files-found: error
- name: Build
run: dotnet build
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,18 @@ on:
workflow_run:
workflows: [CI]
types: [completed]
branches: [api-upgrade] # Wildcard '**' is used to deploy test builds for all branches, for testing deployment workflow.
branches: [develop]

jobs:
deploy:
runs-on: windows-latest
environment:
name: Train
url: https://360ApiTrain.gordon.edu

if: ${{ github.event.workflow_run.conclusion == 'success' }}

steps:
- name: Define deployment environment
run: |
Switch -exact -casesensitive ($Env:GITHUB_REF_NAME)
{
"master" { echo "DEPLOYMENT_ENVIROMENT=Production" >> $GITHUB_ENV }
"develop" { echo "DEPLOYMENT_ENVIROMENT=Train" >> $GITHUB_ENV }
default { echo "DEPLOMENT_ENVIRONMENT=Test" >> $GITHUB_ENV }
}
- uses: actions/checkout@v2

- name: Setup .NET Core SDK 6
Expand All @@ -33,11 +27,11 @@ jobs:
run: dotnet restore

- name: Publish
run: dotnet publish ${{ github.workspace}}\Gordon360.sln -r win-x64 --no-self-contained -o ${{ github.workspace }}\Gordon360\bin\app.publish\ci -p:EnvironmentName=${{ env.DEPLOYMENT_ENVIRONMENT }}
run: dotnet publish ${{ github.workspace}}\Gordon360.sln -r win-x64 --no-self-contained -o ${{ github.workspace }}\Gordon360\bin\app.publish\ci -p:EnvironmentName=${{ secrets.DEPLOYMENT_ENVIRONMENT }}

- name: Upload Build Artifact
uses: actions/[email protected]
with:
name: build-${{ env.DEPLOYMENT_ENVIRONMENT }}
name: build-${{ secrets.DEPLOYMENT_ENVIRONMENT }}
path: ${{ github.workspace }}\Gordon360\bin\app.publish\ci
if-no-files-found: error
17 changes: 3 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ x64/
x86/
bld/
[Bb]in/
[Oo]bj/
# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
Expand Down Expand Up @@ -267,18 +268,6 @@ paket-files/
.idea/
*.sln.iml

## Secret Files
# Environment Specific app settings
appsettings.*.json
secrets.config
test_credentials.py
credentials.py


## Python
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

## Virtual Env
venv/
ENV/
15 changes: 6 additions & 9 deletions Gordon360.sln
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30804.86
# Visual Studio Version 17
VisualStudioVersion = 17.2.32505.173
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gordon360", "Gordon360\Gordon360.csproj", "{47DF568B-4E41-4398-BD88-B6BAB507334A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Gordon360", "Gordon360\Gordon360.csproj", "{47DF568B-4E41-4398-BD88-B6BAB507334A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F6C113A3-839E-41C8-9798-97B6EEEA4392}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -13,17 +13,14 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Gordon360|Any CPU = Gordon360|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{47DF568B-4E41-4398-BD88-B6BAB507334A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{47DF568B-4E41-4398-BD88-B6BAB507334A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{47DF568B-4E41-4398-BD88-B6BAB507334A}.Gordon360|Any CPU.ActiveCfg = Release|Any CPU
{47DF568B-4E41-4398-BD88-B6BAB507334A}.Gordon360|Any CPU.Build.0 = Release|Any CPU
{47DF568B-4E41-4398-BD88-B6BAB507334A}.Gordon360|Any CPU.Deploy.0 = Release|Any CPU
{47DF568B-4E41-4398-BD88-B6BAB507334A}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{47DF568B-4E41-4398-BD88-B6BAB507334A}.Release|Any CPU.Build.0 = Debug|Any CPU
{47DF568B-4E41-4398-BD88-B6BAB507334A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{47DF568B-4E41-4398-BD88-B6BAB507334A}.Release|Any CPU.Build.0 = Release|Any CPU
{47DF568B-4E41-4398-BD88-B6BAB507334A}.Release|Any CPU.Deploy.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
12 changes: 12 additions & 0 deletions Gordon360/.config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"version": 1,
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "6.0.5",
"commands": [
"dotnet-ef"
]
}
}
}
Loading

0 comments on commit 2900eef

Please sign in to comment.