From c55be228883cd31f74fb5c16c68dd1b5c91dc1db Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@btinternet.com>
Date: Tue, 18 Feb 2020 08:15:10 +0000
Subject: [PATCH] Release Workflow Updates

---
 .github/workflows/createrelease.yml | 17 +++++++----------
 .github/workflows/nightlybuild.yml  |  2 +-
 .github/workflows/pullrequest.yml   |  2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/createrelease.yml b/.github/workflows/createrelease.yml
index a719428..d634dc8 100644
--- a/.github/workflows/createrelease.yml
+++ b/.github/workflows/createrelease.yml
@@ -10,7 +10,7 @@ jobs:
     env:
         ASPNETCORE_ENVIRONMENT: "Production"
 
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v1
@@ -38,11 +38,8 @@ jobs:
             
     - name: Build Docker Images 
       run: |
-        docker build . --file TransactionProcessorACL/Dockerfile --tag transactionprocessoracl:latest --tag stuartferguson/transactionprocessoracl:latest --tag stuartferguson/transactionprocessoracl:${{ steps.get_version.outputs.VERSION }}         
-
-    - name: Run Integration Tests
-      run: dotnet test "TransactionProcessorACL.IntegrationTests\TransactionProcessorACL.IntegrationTests.csproj"
-
+        docker build . --file TransactionProcessorACL/Dockerfile --tag stuartferguson/transactionprocessoracl:latest --tag stuartferguson/transactionprocessoracl:${{ steps.get_version.outputs.VERSION }}         
+        
     - name: Publish Images to Docker Hub
       run: |
         docker login --username=${{ secrets.DOCKER_USERNAME }} --password=${{ secrets.DOCKER_PASSWORD }}
@@ -79,8 +76,8 @@ jobs:
     - name: Push Package to Octopus
       run: >-
         /opt/octo/Octo push
-        --server http://sferguson.ddns.net:9001
-        --apiKey API-UTN58QCF8HSATACNUBY41XPUC
+        --server ${{ secrets.OCTOPUS_URL }}
+        --apiKey ${{ secrets.OCTOPUS_APIKEY }}
         --package /home/runner/work/TransactionProcessorACL/TransactionProcessorACL/TransactionProcessorACL.${{ steps.get_version.outputs.VERSION }}.zip
         --overwrite-mode IgnoreIfExists
     
@@ -102,8 +99,8 @@ jobs:
     - name: Create & Deploy Release in Octopus
       run: >-
         /opt/octo/Octo create-release
-        --server http://sferguson.ddns.net:9001
-        --apiKey API-UTN58QCF8HSATACNUBY41XPUC
+        --server ${{ secrets.OCTOPUS_URL }}
+        --apiKey ${{ secrets.OCTOPUS_APIKEY }}
         --project "Transaction Processor ACL"
         --version ${{ steps.get_version.outputs.VERSION }}
         --channel Default
diff --git a/.github/workflows/nightlybuild.yml b/.github/workflows/nightlybuild.yml
index c05b3e0..105c042 100644
--- a/.github/workflows/nightlybuild.yml
+++ b/.github/workflows/nightlybuild.yml
@@ -10,7 +10,7 @@ jobs:
     env:
         ASPNETCORE_ENVIRONMENT: "Production"
 
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v1
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
index 329d640..844f3e5 100644
--- a/.github/workflows/pullrequest.yml
+++ b/.github/workflows/pullrequest.yml
@@ -11,7 +11,7 @@ jobs:
     env:
         ASPNETCORE_ENVIRONMENT: "Production"
 
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v1