Skip to content

Commit

Permalink
use 2.1 (microsoft#944)
Browse files Browse the repository at this point in the history
use version 2.1 in end 2 end test

---------

Co-authored-by: freddydk <[email protected]>
  • Loading branch information
freddydk and freddydk authored Feb 20, 2024
1 parent 907a5c7 commit e9f4cc6
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CleanupTempRepos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ jobs:
# Pipe empty string into GH API --METHOD DELETE due to https://github.com/cli/cli/issues/3937
'' | invoke-gh api --method DELETE -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" "/orgs/$repoOwner/packages/nuget/$($_.name)" --input -
}
invoke-gh repo delete "https://github.com/$repo" --confirm | Out-Host
invoke-gh repo delete "https://github.com/$repo" --yes | Out-Host
}
1 change: 1 addition & 0 deletions Actions/IncrementVersionNumber/IncrementVersionNumber.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ try {
$projectPath = Join-Path $baseFolder $project

$projectSettingsPath = Join-Path $projectPath $ALGoSettingsFile # $ALGoSettingsFile is defined in AL-Go-Helper.ps1
$settings = ReadSettings -baseFolder $baseFolder -project $project

# Ensure the repoVersion setting exists in the project settings. Defaults to 1.0 if it doesn't exist.
Set-VersionInSettingsFile -settingsFilePath $projectSettingsPath -settingName 'repoVersion' -newValue $settings.repoVersion -Force
Expand Down
3 changes: 3 additions & 0 deletions Templates/AppSource App/.github/workflows/CreateRelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,9 @@ jobs:
if: ${{ github.event.inputs.updateVersionNumber!='' }}
runs-on: [ windows-latest ]
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Read settings
uses: microsoft/AL-Go-Actions/ReadSettings@main
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,9 @@ jobs:
if: ${{ github.event.inputs.updateVersionNumber!='' }}
runs-on: [ windows-latest ]
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Read settings
uses: microsoft/AL-Go-Actions/ReadSettings@main
with:
Expand Down
6 changes: 3 additions & 3 deletions e2eTests/Test-AL-Go.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -195,15 +195,15 @@ if ($adminCenterApiToken -and -not $multiProject) {
}

# Increment version number on one project
RunIncrementVersionNumber @p2ProjectsParam -versionNumber 2.0 -wait -branch $branch | Out-Null
RunIncrementVersionNumber @p2ProjectsParam -versionNumber 2.1 -wait -branch $branch | Out-Null
$runs++
$run = MergePRandPull -branch $branch -wait
$runs++
if ($multiProject) {
Test-ArtifactsFromRun -runid $run.id -expectedArtifacts @{"Apps"=1;"TestApps"=1} -expectedNumberOfTests $expectedNumberOfTests -folder 'artifacts2' -repoVersion '2.0' -appVersion ''
Test-ArtifactsFromRun -runid $run.id -expectedArtifacts @{"Apps"=1;"TestApps"=1} -expectedNumberOfTests $expectedNumberOfTests -folder 'artifacts2' -repoVersion '2.1' -appVersion ''
}
else {
Test-ArtifactsFromRun -runid $run.id -expectedArtifacts @{"Apps"=3;"TestApps"=2} -expectedNumberOfTests $expectedNumberOfTests -folder 'artifacts2' -repoVersion '2.0' -appVersion ''
Test-ArtifactsFromRun -runid $run.id -expectedArtifacts @{"Apps"=3;"TestApps"=2} -expectedNumberOfTests $expectedNumberOfTests -folder 'artifacts2' -repoVersion '2.1' -appVersion ''
}
TestNumberOfRuns -expectedNumberOfRuns $runs -repository $repository

Expand Down
2 changes: 1 addition & 1 deletion e2eTests/e2eTestHelper.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ function RemoveRepository {
Write-Host -ForegroundColor Red "Error removing packages"
Write-Host -ForegroundColor Red $_.Exception.Message
}
invoke-gh repo delete $repository --confirm | Out-Host
invoke-gh repo delete $repository --yes | Out-Host
}

if ($path) {
Expand Down

0 comments on commit e9f4cc6

Please sign in to comment.