From 5a31e1709c4deadc12370b2a6d4c328a96b51800 Mon Sep 17 00:00:00 2001 From: Robert Lyn Date: Wed, 9 Nov 2022 16:22:49 -0500 Subject: [PATCH 1/5] Switch to linux build for artifact --- .github/workflows/deploy-dev.yml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index b78d64c..de52d07 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -10,7 +10,7 @@ on: jobs: build: - runs-on: self-hosted + runs-on: ubuntu-latest strategy: matrix: @@ -18,12 +18,19 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} - name: BuildUI run: | - npm install - npm test - npm run build - working-directory: web + npm install --prefix web + npm test --prefix web + npm run build --prefix web + - name: Setup .NET + uses: actions/setup-dotnet@v2 + with: + dotnet-version: 6.0.x - name: Restore dependencies run: dotnet restore - name: Build @@ -42,7 +49,7 @@ jobs: name: website path: ./release/** if-no-files-found: error - + deploy_development: needs: build From bbbfff423484006d1bbc3cac41cbc7588d4e1051 Mon Sep 17 00:00:00 2001 From: Robert Lyn <43123823+RobertLynJA@users.noreply.github.com> Date: Wed, 9 Nov 2022 16:32:13 -0500 Subject: [PATCH 2/5] Fixed case --- .github/workflows/deploy-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index de52d07..9443d32 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -41,7 +41,7 @@ jobs: dotnet test --no-build --verbosity normal API.Tests/API.Tests.csproj - name: Publish run: | - dotnet publish ./api/API.csproj -c Release -o ./release + dotnet publish ./API/API.csproj -c Release -o ./release Copy-Item ./web/build ./release/wwwroot -Recurse -Force - name: Upload a Build Artifact uses: actions/upload-artifact@v3 From 4bd856516322c623af73e72bc2bb8fd615939601 Mon Sep 17 00:00:00 2001 From: Robert Lyn <43123823+RobertLynJA@users.noreply.github.com> Date: Wed, 9 Nov 2022 16:38:41 -0500 Subject: [PATCH 3/5] Separate React build artifact --- .github/workflows/deploy-dev.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 9443d32..c12f822 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -41,14 +41,19 @@ jobs: dotnet test --no-build --verbosity normal API.Tests/API.Tests.csproj - name: Publish run: | - dotnet publish ./API/API.csproj -c Release -o ./release - Copy-Item ./web/build ./release/wwwroot -Recurse -Force - - name: Upload a Build Artifact + dotnet publish ./API/API.csproj -c Release -o ./release + - name: Upload a Build Artifact (.Net) uses: actions/upload-artifact@v3 with: name: website path: ./release/** if-no-files-found: error + - name: Upload a Build Artifact (React) + uses: actions/upload-artifact@v3 + with: + name: react + path: ./web/build/** + if-no-files-found: error deploy_development: @@ -57,11 +62,16 @@ jobs: environment: Development steps: - - name: Download a Build Artifact + - name: Download a Build Artifact (.Net) uses: actions/download-artifact@v3 with: name: website path: website + - name: Download a Build Artifact (React) + uses: actions/download-artifact@v3 + with: + name: react + path: website/wwwroot - name: Add secrets uses: microsoft/variable-substitution@v1 with: From c2288302ad638da7491f3a4a7482b5184332060e Mon Sep 17 00:00:00 2001 From: Robert Lyn Date: Wed, 9 Nov 2022 16:46:17 -0500 Subject: [PATCH 4/5] Made similar changes to prod deployment --- .github/workflows/deploy-prod.yml | 43 +++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 4374f1c..acdf7f7 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: self-hosted + runs-on: ubuntu-latest strategy: matrix: @@ -17,12 +17,19 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} - name: BuildUI run: | - npm install - npm test - npm run build - working-directory: web + npm install --prefix web + npm test --prefix web + npm run build --prefix web + - name: Setup .NET + uses: actions/setup-dotnet@v2 + with: + dotnet-version: 6.0.x - name: Restore dependencies run: dotnet restore - name: Build @@ -33,27 +40,37 @@ jobs: dotnet test --no-build --verbosity normal API.Tests/API.Tests.csproj - name: Publish run: | - dotnet publish ./api/API.csproj -c Release -o ./release - Copy-Item ./web/build ./release/wwwroot -Recurse -Force - - name: Upload a Build Artifact + dotnet publish ./API/API.csproj -c Release -o ./release + - name: Upload a Build Artifact (.Net) uses: actions/upload-artifact@v3 with: name: website path: ./release/** if-no-files-found: error - - deploy_production: + - name: Upload a Build Artifact (React) + uses: actions/upload-artifact@v3 + with: + name: react + path: ./web/build/** + if-no-files-found: error + + deploy_development: needs: build - runs-on: [ self-hosted, Production ] - environment: Production + runs-on: [ self-hosted, Development ] + environment: Development steps: - - name: Download a Build Artifact + - name: Download a Build Artifact (.Net) uses: actions/download-artifact@v3 with: name: website path: website + - name: Download a Build Artifact (React) + uses: actions/download-artifact@v3 + with: + name: react + path: website/wwwroot - name: Add secrets uses: microsoft/variable-substitution@v1 with: From 3e75a95db41adfd5aa820da8092a31fee64aab1c Mon Sep 17 00:00:00 2001 From: Robert Lyn Date: Wed, 9 Nov 2022 16:48:42 -0500 Subject: [PATCH 5/5] Change deploy job name --- .github/workflows/deploy-dev.yml | 2 +- .github/workflows/deploy-prod.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index c12f822..910e48d 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -55,7 +55,7 @@ jobs: path: ./web/build/** if-no-files-found: error - deploy_development: + deploy: needs: build runs-on: [ self-hosted, Development ] diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index acdf7f7..fef4102 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -54,7 +54,7 @@ jobs: path: ./web/build/** if-no-files-found: error - deploy_development: + deploy: needs: build runs-on: [ self-hosted, Development ]