Skip to content

Commit bbdf695

Browse files
Dedub envs
1 parent 97d7a9f commit bbdf695

File tree

1 file changed

+14
-31
lines changed

1 file changed

+14
-31
lines changed

.github/workflows/Test-ModuleLocal.yml

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,16 @@ on:
6262
permissions:
6363
contents: read # to checkout the repo and create releases on the repo
6464

65+
env:
66+
TEST_APP_ENT_CLIENT_ID: ${{ secrets.TEST_APP_ENT_CLIENT_ID }}
67+
TEST_APP_ENT_PRIVATE_KEY: ${{ secrets.TEST_APP_ENT_PRIVATE_KEY }}
68+
TEST_APP_ORG_CLIENT_ID: ${{ secrets.TEST_APP_ORG_CLIENT_ID }}
69+
TEST_APP_ORG_PRIVATE_KEY: ${{ secrets.TEST_APP_ORG_PRIVATE_KEY }}
70+
TEST_USER_ORG_FG_PAT: ${{ secrets.TEST_USER_ORG_FG_PAT }}
71+
TEST_USER_USER_FG_PAT: ${{ secrets.TEST_USER_USER_FG_PAT }}
72+
TEST_USER_PAT: ${{ secrets.TEST_USER_PAT }}
73+
GITHUB_TOKEN: ${{ github.token }}
74+
6575
jobs:
6676
BeforeAll-ModuleLocal:
6777
name: BeforeAll-ModuleLocal
@@ -75,15 +85,6 @@ jobs:
7585

7686
- name: Run BeforeAll Setup Scripts
7787
uses: PSModule/GitHub-Script@v1
78-
env:
79-
TEST_APP_ENT_CLIENT_ID: ${{ secrets.TEST_APP_ENT_CLIENT_ID }}
80-
TEST_APP_ENT_PRIVATE_KEY: ${{ secrets.TEST_APP_ENT_PRIVATE_KEY }}
81-
TEST_APP_ORG_CLIENT_ID: ${{ secrets.TEST_APP_ORG_CLIENT_ID }}
82-
TEST_APP_ORG_PRIVATE_KEY: ${{ secrets.TEST_APP_ORG_PRIVATE_KEY }}
83-
TEST_USER_ORG_FG_PAT: ${{ secrets.TEST_USER_ORG_FG_PAT }}
84-
TEST_USER_USER_FG_PAT: ${{ secrets.TEST_USER_USER_FG_PAT }}
85-
TEST_USER_PAT: ${{ secrets.TEST_USER_PAT }}
86-
GITHUB_TOKEN: ${{ github.token }}
8788
with:
8889
Name: BeforeAll-ModuleLocal
8990
ShowInfo: false
@@ -122,13 +123,13 @@ jobs:
122123
123124
foreach ($folder in $allTestFolders) {
124125
$beforeAllScript = Join-Path $folder "BeforeAll.ps1"
125-
126+
126127
if (Test-Path $beforeAllScript -PathType Leaf) {
127128
# Get unique directory path to avoid duplicate execution
128129
$uniqueDirectory = Resolve-Path $folder -Relative
129130
if ($processedDirectories -notcontains $uniqueDirectory) {
130131
$processedDirectories += $uniqueDirectory
131-
132+
132133
Write-Host "Running BeforeAll setup script: $beforeAllScript"
133134
try {
134135
Push-Location $folder
@@ -189,15 +190,6 @@ jobs:
189190
190191
- name: Test-ModuleLocal
191192
uses: PSModule/Invoke-Pester@v4
192-
env:
193-
TEST_APP_ENT_CLIENT_ID: ${{ secrets.TEST_APP_ENT_CLIENT_ID }}
194-
TEST_APP_ENT_PRIVATE_KEY: ${{ secrets.TEST_APP_ENT_PRIVATE_KEY }}
195-
TEST_APP_ORG_CLIENT_ID: ${{ secrets.TEST_APP_ORG_CLIENT_ID }}
196-
TEST_APP_ORG_PRIVATE_KEY: ${{ secrets.TEST_APP_ORG_PRIVATE_KEY }}
197-
TEST_USER_ORG_FG_PAT: ${{ secrets.TEST_USER_ORG_FG_PAT }}
198-
TEST_USER_USER_FG_PAT: ${{ secrets.TEST_USER_USER_FG_PAT }}
199-
TEST_USER_PAT: ${{ secrets.TEST_USER_PAT }}
200-
GITHUB_TOKEN: ${{ github.token }} # Used in tests!
201193
with:
202194
Debug: ${{ inputs.Debug }}
203195
Prerelease: ${{ inputs.Prerelease }}
@@ -233,15 +225,6 @@ jobs:
233225
- name: Run AfterAll Teardown Scripts
234226
if: always()
235227
uses: PSModule/GitHub-Script@v1
236-
env:
237-
TEST_APP_ENT_CLIENT_ID: ${{ secrets.TEST_APP_ENT_CLIENT_ID }}
238-
TEST_APP_ENT_PRIVATE_KEY: ${{ secrets.TEST_APP_ENT_PRIVATE_KEY }}
239-
TEST_APP_ORG_CLIENT_ID: ${{ secrets.TEST_APP_ORG_CLIENT_ID }}
240-
TEST_APP_ORG_PRIVATE_KEY: ${{ secrets.TEST_APP_ORG_PRIVATE_KEY }}
241-
TEST_USER_ORG_FG_PAT: ${{ secrets.TEST_USER_ORG_FG_PAT }}
242-
TEST_USER_USER_FG_PAT: ${{ secrets.TEST_USER_USER_FG_PAT }}
243-
TEST_USER_PAT: ${{ secrets.TEST_USER_PAT }}
244-
GITHUB_TOKEN: ${{ github.token }}
245228
with:
246229
Name: AfterAll-ModuleLocal
247230
ShowInfo: false
@@ -280,13 +263,13 @@ jobs:
280263
281264
foreach ($folder in $allTestFolders) {
282265
$afterAllScript = Join-Path $folder "AfterAll.ps1"
283-
266+
284267
if (Test-Path $afterAllScript -PathType Leaf) {
285268
# Get unique directory path to avoid duplicate execution
286269
$uniqueDirectory = Resolve-Path $folder -Relative
287270
if ($processedDirectories -notcontains $uniqueDirectory) {
288271
$processedDirectories += $uniqueDirectory
289-
272+
290273
Write-Host "Running AfterAll teardown script: $afterAllScript"
291274
try {
292275
Push-Location $folder

0 commit comments

Comments
 (0)