Skip to content

Commit c55cb04

Browse files
committed
Fix some test discovery scope issues
1 parent 40e0a79 commit c55cb04

4 files changed

Lines changed: 13 additions & 16 deletions

File tree

.earthlyignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
.vscode/*
55
build.earth
66
# ignore Output (because we output there now)
7-
/Output/*
7+
[oO]utput/*
88
# These aren't part of the module (yet)
9-
/PotentialContribution/*
10-
/Content/*
9+
PotentialContribution/*
10+
Content/*
1111

.github/workflows/build.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,12 @@ jobs:
4242
uses: actions/upload-artifact@v7
4343
with:
4444
name: ModuleBuilder
45-
path: Output/ModuleBuilder
46-
if-no-files-found: ignore
45+
path: output/ModuleBuilder
4746

4847
- uses: actions/upload-artifact@v7
4948
with:
5049
name: TestResults
51-
path: Output/results
52-
if-no-files-found: ignore
50+
path: output/results
5351

5452
# These ones are just for the test matrix
5553
- name: Upload Tests
@@ -84,8 +82,8 @@ jobs:
8482
- name: Download Build Output
8583
uses: actions/download-artifact@v4
8684
with:
87-
name: Modules
88-
path: Output # /home/runner/work/ModuleBuilder/ModuleBuilder/Output
85+
name: ModuleBuilder
86+
path: output/ModuleBuilder # /home/runner/work/ModuleBuilder/ModuleBuilder/output/ModuleBuilder
8987
- name: Install Output Modules
9088
shell: pwsh
9189
run: | # PowerShell
@@ -96,7 +94,7 @@ jobs:
9694
Join-Path $HOME '.local/share/powershell/Modules'
9795
}
9896
99-
Get-ChildItem -Directory Output -OutVariable Modules
97+
Get-ChildItem -Directory output -OutVariable Modules
10098
| Move-Item -Destination { Join-Path $ModuleDestination $_.Name } -Force
10199
102100
Write-Host "Installing $($Modules -join ', ') to $ModuleDestination"

.gitignore

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# All of these folders are (or were) build outputs
22
[0-9]*/
3-
Modules/
4-
Output/
5-
obj/
6-
Tools/
3+
[Mm]odules/
4+
[Oo]utput/
5+
[Tt]ools/
76
coverage.xml

build.earth

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ build:
4646
RUN -- pwsh -File "${IB_TASK_ROOT}/scripts/Invoke-Build.ps1" Build
4747

4848
# SAVE ARTIFACT [--keep-ts] [--keep-own] [--if-exists] [--force] <src> [<artifact-dest-path>] [AS LOCAL <local-path>]
49-
SAVE ARTIFACT $IB_OUTPUT_ROOT/$IB_MODULE_NAME AS LOCAL ./Output/$IB_MODULE_NAME
49+
SAVE ARTIFACT $IB_OUTPUT_ROOT/$IB_MODULE_NAME AS LOCAL ./output/$IB_MODULE_NAME
5050

5151
# test runs the tests and probably fails if the tests fail
5252
test:
5353
ARG EARTHLY_GIT_BRANCH
5454
BUILD +build
5555
FROM +build
5656
RUN -- pwsh -File "${IB_TASK_ROOT}/scripts/Invoke-Build.ps1" Test
57-
SAVE ARTIFACT $IB_RESULTS_ROOT AS LOCAL ./Output$IB_RESULTS_ROOT
57+
SAVE ARTIFACT $IB_RESULTS_ROOT AS LOCAL ./output$IB_RESULTS_ROOT
5858

5959
# publish runs publish and push tasks if the tests pass and --push was specified.
6060
# It needs the API keys to be passed in as secrets

0 commit comments

Comments
 (0)