Pass sqlcompare version and redgate credentials

funfair-tech · Nov 13, 2024 · 9caf43f · 9caf43f
1 parent 34f69a9
commit 9caf43f
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 9 deletions.
diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -145,6 +145,9 @@ inputs:
   REDGATE_PAT:
     description: 'Redgate authentication Personal Access Token'
     required: true
+  SQLCOMPARE_VERSION:
+    description: 'Version of SQL Compare to use'
+    required: true
 
 runs:
   using: "composite"
@@ -334,6 +337,7 @@ runs:
         DB_FOLDER: ${{github.workspace}}/db
         REDGATE_EMAIL: ${{inputs.REDGATE_EMAIL}}
         REDGATE_PAT: ${{inputs.REDGATE_EMAIL}}
+        SQLCOMPARE_VERSION: ${{inputs.SQLCOMPARE_VERSION}}
         NUGET_PACK: ${{inputs.NUGET_PACK}}
         NUGET_FEED: ${{inputs.NUGET_FEED}}
         NUGET_SYMBOL_FEED: ${{inputs.NUGET_SYMBOL_FEED}}
@@ -419,7 +423,8 @@ runs:
         SQL_PASSWORD: ${{inputs.SQL_PASSWORD}}
         DB_FOLDER: ${{github.workspace}}/db
         REDGATE_EMAIL: ${{inputs.REDGATE_EMAIL}}
-        REDGATE_PAT: ${{inputs.REDGATE_EMAIL}}
+        REDGATE_PAT: ${{inputs.REDGATE_PAT}}
+        SQLCOMPARE_VERSION: ${{inputs.SQLCOMPARE_VERSION}}
 
     - name: "Dotnet: Cloudformation Deploy"
       if: |-

diff --git a/.github/actions/database-deploy/action.yml b/.github/actions/database-deploy/action.yml
@@ -26,6 +26,9 @@ inputs:
   REDGATE_PAT:
     description: 'Redgate authentication Personal Access Token'
     required: true
+  SQLCOMPARE_VERSION:
+    description: 'Version of SQL Compare to use'
+    required: true
 
 runs:
   using: "composite"
@@ -35,15 +38,17 @@ runs:
       shell: bash
       run: docker pull redgate/sqlcompare:15.3.0
 
+    # Need to get these to work
+    #  /email:"${{inputs.REDGATE_EMAIL}}" \
+    #  /token:"${{inputs.REDGATE_PAT}}" \
     - name: "Build SQL Diff change"
       shell: bash
       run: |
         docker run \
           "-v$GITHUB_WORKSPACE:$GITHUB_WORKSPACE" \
           --net=host \
-          --rm redgate/sqlcompare:15.3.0 \
-          --email="${{inputs.REDGATE_EMAIL}}" \
-          --token="${{inputs.REDGATE_PAT}}" \
+          --rm \
+          "redgate/sqlcompare:${{inputs.SQLCOMPARE_VERSION}}" \
           /IAgreeToTheEULA \
           /filter:"$DB_FILTER" \
           /options:CaseSensitiveObjectDefinition,ConsiderNextFilegroupInPartitionSchemes,DecryptPost2kEncryptedObjects,DoNotOutputCommentHeader,ForceColumnOrder,IgnoreCertificatesAndCryptoKeys,IgnoreDatabaseAndServerName,IgnoreUserProperties,IgnoreUsersPermissionsAndRoleMemberships,IgnoreWhiteSpace,IgnoreWithElementOrder,IncludeDependencies,NoDeploymentLogging,ThrowOnFileParseFailed,UseCompatibilityLevel \

diff --git a/.github/actions/dotnet/action.yml b/.github/actions/dotnet/action.yml
@@ -48,6 +48,9 @@ inputs:
   REDGATE_PAT:
     description: 'Redgate authentication Personal Access Token'
     required: true
+  SQLCOMPARE_VERSION:
+    description: 'Version of SQL Compare to use'
+    required: true
 
   # GENERAL
   GITHUB_TOKEN:
@@ -155,7 +158,8 @@ runs:
       BUILD_VERSION: ${{inputs.BUILD_VERSION}}
       DB_FOLDER: ${{inputs.DB_FOLDER}}
       REDGATE_EMAIL: ${{inputs.REDGATE_EMAIL}}
-      REDGATE_PAT: ${{inputs.REDGATE_EMAIL}}
+      REDGATE_PAT: ${{inputs.REDGATE_PAT}}
+      SQLCOMPARE_VERSION: ${{inputs.SQLCOMPARE_VERSION}}
 
   ############################################################################################################
   # Publish ready for deploy

diff --git a/.github/actions/sql/action.yml b/.github/actions/sql/action.yml
@@ -17,6 +17,9 @@ inputs:
   REDGATE_PAT:
     description: 'Redgate authentication Personal Access Token'
     required: true
+  SQLCOMPARE_VERSION:
+    description: 'Version of SQL Compare to use'
+    required: true
 
 runs:
   using: "composite"
@@ -48,17 +51,19 @@ runs:
 
   - name: "SQL: Get SQL Compare"
     shell: bash
-    run: docker pull redgate/sqlcompare:15.3.0
+    run: docker pull "redgate/sqlcompare:${{inputs.SQLCOMPARE_VERSION}}"
 
+    # Need to get these to work
+    #  /email:"${{inputs.REDGATE_EMAIL}}" \
+    #  /token:"${{inputs.REDGATE_PAT}}" \
   - name: "Build SQL change"
     shell: bash
     run: |
       docker run \
              "-v$GITHUB_WORKSPACE:$GITHUB_WORKSPACE" \
              --net=host \
-             --rm redgate/sqlcompare:15.3.0 \
-            --email="${{inputs.REDGATE_EMAIL}}" \
-            --token="${{inputs.REDGATE_PAT}}" \
+             --rm \
+             "redgate/sqlcompare:${{inputs.SQLCOMPARE_VERSION}}" \
              /IAgreeToTheEULA \
              /filter:"$DB_FILTER" \
              /options:CaseSensitiveObjectDefinition,ConsiderNextFilegroupInPartitionSchemes,DecryptPost2kEncryptedObjects,DoNotOutputCommentHeader,ForceColumnOrder,IgnoreCertificatesAndCryptoKeys,IgnoreDatabaseAndServerName,IgnoreUserProperties,IgnoreUsersPermissionsAndRoleMemberships,IgnoreWhiteSpace,IgnoreWithElementOrder,IncludeDependencies,NoDeploymentLogging,ThrowOnFileParseFailed,UseCompatibilityLevel \

diff --git a/.github/workflows/build-and-publish-pre-release.yml b/.github/workflows/build-and-publish-pre-release.yml
@@ -31,6 +31,7 @@ jobs:
 
     env:
       REPO_STATUS: ${{vars.REPO_VISIBILITY}}
+      SQLCOMPARE_VERSION: 15.3.13
 
     steps:
       - name: "Initialise Workspace"
@@ -106,6 +107,7 @@ jobs:
           SQL_PASSWORD: ${{secrets.SQL_PASSWORD}}
           REDGATE_EMAIL: ${{secrets.REDGATE_EMAIL}}
           REDGATE_PAT: ${{secrets.REDGATE_PAT}}
+          SQLCOMPARE_VERSION: ${{env.SQLCOMPARE_VERSION}}
           CREATE_RELEASE: false
 
       - name: "Build and deploy"
@@ -153,6 +155,7 @@ jobs:
           SQL_PASSWORD: ${{secrets.SQL_PASSWORD}}
           REDGATE_EMAIL: ${{secrets.REDGATE_EMAIL}}
           REDGATE_PAT: ${{secrets.REDGATE_PAT}}
+          SQLCOMPARE_VERSION: ${{env.SQLCOMPARE_VERSION}}
           CREATE_RELEASE: false
 
       - name: "Build Version"

diff --git a/.github/workflows/build-and-publish-release.yml b/.github/workflows/build-and-publish-release.yml
@@ -22,6 +22,7 @@ jobs:
 
     env:
       REPO_STATUS: ${{vars.REPO_VISIBILITY}}
+      SQLCOMPARE_VERSION: 15.3.13
 
     steps:
       - name: "Initialise Workspace"
@@ -97,6 +98,7 @@ jobs:
           SQL_PASSWORD: ${{secrets.SQL_PASSWORD}}
           REDGATE_EMAIL: ${{secrets.REDGATE_EMAIL}}
           REDGATE_PAT: ${{secrets.REDGATE_PAT}}
+          SQLCOMPARE_VERSION: ${{env.SQLCOMPARE_VERSION}}
           CREATE_RELEASE: true
 
       - name: "Build and deploy"
@@ -144,6 +146,7 @@ jobs:
           SQL_PASSWORD: ${{secrets.SQL_PASSWORD}}
           REDGATE_EMAIL: ${{secrets.REDGATE_EMAIL}}
           REDGATE_PAT: ${{secrets.REDGATE_PAT}}
+          SQLCOMPARE_VERSION: ${{env.SQLCOMPARE_VERSION}}
           CREATE_RELEASE: true
 
       - name: "Build Version"