Upgrade to Tasks v2

Author: Jaykul

Build.build.ps1 build.build.ps1Build.build.ps1 renamed to build.build.ps1

@@ -1,4 +1,3 @@
-#Requires -Modules @{ ModuleName = 'InvokeBuild'; ModuleVersion = '5.14.0' }
 <#
 .SYNOPSIS
     ./project.build.ps1
@@ -19,10 +18,7 @@ param(
 
 ## Self-contained build script - can be invoked directly or via Invoke-Build
 if ($MyInvocation.ScriptName -notlike '*Invoke-Build.ps1') {
-    Write-Information "Bootstrap Build Dependencies" -Tag "InvokeBuild"
-    . (Convert-Path ../*BuildTasks/scripts/Bootstrap.ps1)
-
-    Invoke-Build -File $MyInvocation.MyCommand.Path @PSBoundParameters -Result Result
+    . (Convert-Path ../../[tT]asks/scripts/Invoke-Build.ps1) -File $MyInvocation.MyCommand.Path @PSBoundParameters -Result Result
 
     if ($Result.Error) {
         $Error[-1].ScriptStackTrace | Out-Host

build.earth

@@ -1,59 +1,60 @@
-VERSION --try 0.8
-IMPORT github.com/poshcode/tasks
-FROM mcr.microsoft.com/dotnet/sdk:9.0
-WORKDIR /work
+VERSION 0.8
+IMPORT github.com/poshcode/tasks:feature/ld AS tasks
+FROM mcr.microsoft.com/dotnet/sdk:10.0
+WORKDIR /earth
 
 ARG --global EARTHLY_GIT_ORIGIN_URL
 ARG --global EARTHLY_BUILD_SHA
 ARG --global EARTHLY_GIT_BRANCH
 # These are my common paths, used in my shared /Tasks repo
-ARG --global OUTPUT_ROOT=/Modules
-ARG --global TEST_ROOT=/Tests
-ARG --global TEMP_ROOT=/temp
+ARG --global IB_OUTPUT_ROOT=/Modules
+ARG --global IB_TEST_RESULTS_ROOT=/TestResults
+ARG --global IB_TEMP_ROOT=/temp
 # These are my common build args, used in my shared /Tasks repo
-ARG --global MODULE_NAME=ModuleBuilder
-ARG --global CONFIGURATION=Release
+ARG --global IB_MODULE_NAME=ModuleBuilder
+ARG --global IB_CONFIGURATION=Release
 
 
 bootstrap:
     # Dotnet tools and scripts installed by PSGet
     ENV PATH=$HOME/.dotnet/tools:$HOME/.local/share/powershell/Scripts:$PATH
-    RUN mkdir /Tasks \
+    RUN mkdir /Tasks $IB_OUTPUT_ROOT $IB_TEST_RESULTS_ROOT $IB_TEMP_ROOT \
         && git config --global user.email "Jaykul@HuddledMasses.org" \
         && git config --global user.name "Earthly Build"
     # I'm using Invoke-Build tasks from this other repo which rarely changes
     COPY tasks+tasks/* /Tasks
     # Dealing with dependencies first allows earthly (docker) to cache layers for us
     # So the dependency cache only re-builds when you change the list in these files
-    COPY build.requires.psd1 .
-    # COPY *.csproj .
-    RUN ["pwsh", "-File", "/Tasks/_Bootstrap.ps1", "-RequiresPath", "build.requires.psd1"]
+    COPY build.* .
+    COPY --if-exists dotnet-tools.json .
+    COPY --if-exists .config/dotnet-tools.json .
+    # COPY --if-exists **/*.csproj .
+    RUN ["pwsh", "-File", "/Tasks/scripts/Invoke-Build.ps1", "Initialize", "build.build.ps1"]
 
 build:
     FROM +bootstrap
-    RUN mkdir $OUTPUT_ROOT $TEST_ROOT $TEMP_ROOT
     # make sure you have output folders (like bin, obj, Modules) in .earthlyignore
     # NOTE: we copy .git because we use GitVersion in the build to calculate the version
     #       To avoid that, we could pass the version as an ARG
     COPY . .
-    RUN ["pwsh", "-Command", "Invoke-Build", "-Task", "Build", "-File", "Build.build.ps1"]
+    RUN ["pwsh", "-File", "/Tasks/scripts/Invoke-Build.ps1", "Build", "build.build.ps1"]
 
     # SAVE ARTIFACT [--keep-ts] [--keep-own] [--if-exists] [--force] <src> [<artifact-dest-path>] [AS LOCAL <local-path>]
-    SAVE ARTIFACT $OUTPUT_ROOT/$MODULE_NAME AS LOCAL ./Modules/$MODULE_NAME
+    SAVE ARTIFACT $IB_OUTPUT_ROOT/$IB_MODULE_NAME AS LOCAL ./Output/$IB_MODULE_NAME
 
 test:
     FROM +build
-    SAVE ARTIFACT $OUTPUT_ROOT/$MODULE_NAME AS LOCAL ./Modules/$MODULE_NAME
-    TRY
-        RUN ["pwsh", "-Command", "Invoke-Build", "-Task", "Test", "-File", "Build.build.ps1"]
-    FINALLY
+    SAVE ARTIFACT $IB_OUTPUT_ROOT/$IB_MODULE_NAME AS LOCAL ./Output/$IB_MODULE_NAME
+    # TRY
+        RUN ["pwsh", "-File", "/Tasks/scripts/Invoke-Build.ps1", "Test", "build.build.ps1"]
+    # FINALLY
         # re-output the build output so we can rely on running just +test locally
-        SAVE ARTIFACT /Tests/coverage.xml AS LOCAL ./Modules/coverage.xml
-    END
-    SAVE ARTIFACT /Tests AS LOCAL ./Modules/$MODULE_NAME-TestResults
+        # SAVE ARTIFACT /Tests/ModuleBuilder/coverage.xml AS LOCAL ./Output/testresults/ModuleBuilder/coverage.xml
+    # END
+    SAVE ARTIFACT $IB_TEST_RESULTS_ROOT AS LOCAL ./Output/testresults/
 all:
     # If we only reference with FROM (or COPY) the outputs will not be produced
     BUILD +test
     FROM +build
     RUN --push --secret NUGET_API_KEY --secret PSGALLERY_API_KEY -- \
-        pwsh -Command Invoke-Build -Task Push -File Build.build.ps1 -Verbose
+        pwsh -File /Tasks/scripts/Invoke-Build.ps1 Push build.build.ps1 -Verbose

build.requires.psd1

@@ -8,4 +8,5 @@
     PSScriptAnalyzer = ":[1.21.0, 2.0)"
     InvokeBuild      = ":[5.10.4, 6.0)"
     GitHubActions    = ":[1.1.0,  2.0)"
+    ConvertToSARIF   = ":[1.0.0,  2.0)"
 }