Merge pull request #1416 from Particular/workflow-updates

Workflow updates
Particular · Mar 12, 2024 · 2f0252c · 2f0252c
2 parents 76dd1af + 1ff6ed5
commit 2f0252c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,6 +8,9 @@ on:
   workflow_dispatch:
 env:
   DOTNET_NOLOGO: true
+defaults:
+  run:
+    shell: pwsh
 jobs:
   build:
     name: ${{ matrix.os-name }}-${{ matrix.engine }}
@@ -27,7 +30,6 @@ jobs:
       - name: Check for secrets
         env:
           SECRETS_AVAILABLE: ${{ secrets.SECRETS_AVAILABLE }}
-        shell: pwsh
         run: exit $(If ($env:SECRETS_AVAILABLE -eq 'true') { 0 } Else { 1 })
       - name: Checkout
         uses: actions/checkout@v4.1.1
@@ -60,7 +62,6 @@ jobs:
       - name: Setup PostgreSql 15.x
         id: setup-postgresql
         if: matrix.engine == 'PostgreSql'
-        shell: pwsh
         run: |
           echo "Getting the Azure region in which this workflow is running..."
           $hostInfo = curl -H Metadata:true --noproxy "*" "http://169.254.169.254/metadata/instance?api-version=2021-02-01" | ConvertFrom-Json
@@ -108,7 +109,6 @@ jobs:
       - name: Setup MySQL
         id: setup-mysql
         if: matrix.engine == 'MySql'
-        shell: pwsh
         run: |
           echo '[client]
           user=root
@@ -153,7 +153,6 @@ jobs:
           tag: SqlPersistence
       - name: Prepare Connection Strings for Oracle
         if: matrix.engine == 'Oracle'
-        shell: pwsh
         run: |
           $connectionString = $Env:OracleConnectionString
           "OracleConnectionString=$($connectionString.Replace('system', 'particular'))" >> $Env:GITHUB_ENV
@@ -162,7 +161,6 @@ jobs:
         uses: Particular/run-tests-action@v1.6.0
       - name: Teardown infrastructure
         if: ${{ always() }}
-        shell: pwsh
         run: |
           if ('${{ matrix.engine }}' -eq 'PostgreSql') {
             echo "Removing container ${{ steps.setup-postgresql.outputs.name }}"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,6 +6,9 @@ on:
       - '[0-9]+.[0-9]+.[0-9]+-*'
 env:
   DOTNET_NOLOGO: true
+defaults:
+  run:
+    shell: pwsh
 jobs:
   release:
     runs-on: windows-2022
@@ -34,6 +37,7 @@ jobs:
           path: nugets/*
           retention-days: 1
       - name: Deploy
-        uses: Particular/push-octopus-package-action@v1.2.1
+        # Does not follow standard practice of targeting explicit versions because configuration is tightly coupled to Octopus Deploy configuration
+        uses: Particular/push-octopus-package-action@main
         with:
           octopus-deploy-api-key: ${{ secrets.OCTOPUS_DEPLOY_API_KEY }}