diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index e0f594d..232f452 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -13,9 +13,7 @@ on: branches: - 'main' release: - types: [created] - schedule: - - cron: '0 3 * * 3' + types: [published] env: BUILD_TYPE: 'Release' @@ -23,7 +21,6 @@ env: CHOCO_BIZTALK_MIGRATOR_PACKAGE: '..\..\build\chocolatey\biztalkmigrator\biztalkmigrator.nuspec' CHOCO_CONFIG_DIR: 'build/chocolatey' CHOCO_PACKAGE_OUTPUT_DIR: 'choco-package' - CHOCO_PACKAGE_REPO_INTERNAL: 'https://push.chocolatey.org/' CHOCO_PACKAGE_REPO_PUBLIC: 'https://push.chocolatey.org/' CHOCO_PACKAGE_REPO_FOLDER: 'chocolatey-packages' CHOCO_SRC_DIR: 'choco-src' @@ -53,8 +50,8 @@ jobs: if: github.event_name == 'push' || github.event_name == 'pull_request' uses: actions/checkout@v2 - - name: Checkout from main branch - if: github.event_name == 'schedule' + - name: Checkout from main branch + if: github.event_name == 'release' uses: actions/checkout@v2 with: ref: main @@ -66,7 +63,7 @@ jobs: # Note: 2 version numbers are created, semantic versioning 1 for Chocolatey and semantic versioning 2 for NuGet. - name: Set the version number suffix - if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'schedule' + if: github.event_name == 'push' || github.event_name == 'pull_request' shell: bash run: | seconds_at_midnight=$(date --utc -d 'today 00:00:00' +"%s") @@ -85,12 +82,6 @@ jobs: - name: Update the nuget config with the credentials for the GitHub Package Repository run: dotnet nuget update source ${{ env.NUGET_SOURCE_NAME }} --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} - - name: Update the Chocolatey dependencies for scheduled builds - if: github.event_name == 'schedule' - shell: powershell - run: | - .\build\scripts\Update-ChocolateyPackageVersionNumbers.ps1 -nuspecFileName "${{ env.CHOCO_BIZTALK_MIGRATOR_PACKAGE }}" -chocoSource ${{ secrets.AIM_CHOCO_PUBLIC_REPO_PRE_AUTHENTICATED_URL }} - - name: Restore project dependencies run: dotnet restore @@ -144,28 +135,9 @@ jobs: choco pack $f --version=${{ env.VERSION_NUMBER_SEM1 }} --outputdirectory ./${{ env.OUTPUT_DIR }}/${{ env.CHOCO_PACKAGE_OUTPUT_DIR }} done - - name: Push the Chocolatey package to the internal repo + - name: Push the Chocolatey package to the public repo if: github.event_name == 'release' || (github.event_name == 'push' && github.ref == 'refs/heads/main') shell: bash - run: | - find ./${{ env.OUTPUT_DIR }}/${{ env.CHOCO_PACKAGE_OUTPUT_DIR }}/ -name "*.nupkg" | - while read f; do - retryCount=0 - while true; do - choco push $f -s ${{ env.CHOCO_PACKAGE_REPO_INTERNAL }} -k ${{ secrets.AIM_CHOCO_INTERNAL_REPO_TOKEN }} && break - retryCount=$((retryCount+1)) - if (( "$retryCount" <= ${{ env.SCRIPT_MAX_RETRIES }} )); then - echo "Retrying the processing of $f" - sleep ${{ env.SCRIPT_RETRY_SLEEP_IN_SECONDS }} - else - break - fi - done - done - - - name: Push the Chocolatey package to the publicly shared repo - if: github.event_name == 'schedule' - shell: bash run: | find ./${{ env.OUTPUT_DIR }}/${{ env.CHOCO_PACKAGE_OUTPUT_DIR }}/ -name "*.nupkg" | while read f; do @@ -174,7 +146,7 @@ jobs: choco push $f -s ${{ env.CHOCO_PACKAGE_REPO_PUBLIC }} -k ${{ secrets.AIM_CHOCO_PUBLIC_REPO_TOKEN }} && break retryCount=$((retryCount+1)) if (( "$retryCount" <= ${{ env.SCRIPT_MAX_RETRIES }} )); then - echo "Retrying the processing of $f" + echo "Retrying the processing of $f" sleep ${{ env.SCRIPT_RETRY_SLEEP_IN_SECONDS }} else break diff --git a/src/Microsoft.AzureIntegrationMigration.BizTalk.Analyze/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.csproj b/src/Microsoft.AzureIntegrationMigration.BizTalk.Analyze/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.csproj index 7cc065a..a9515ac 100644 --- a/src/Microsoft.AzureIntegrationMigration.BizTalk.Analyze/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.csproj +++ b/src/Microsoft.AzureIntegrationMigration.BizTalk.Analyze/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.csproj @@ -34,7 +34,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Microsoft.AzureIntegrationMigration.BizTalk.Convert/Microsoft.AzureIntegrationMigration.BizTalk.Convert.csproj b/src/Microsoft.AzureIntegrationMigration.BizTalk.Convert/Microsoft.AzureIntegrationMigration.BizTalk.Convert.csproj index b3d75af..88e6412 100644 --- a/src/Microsoft.AzureIntegrationMigration.BizTalk.Convert/Microsoft.AzureIntegrationMigration.BizTalk.Convert.csproj +++ b/src/Microsoft.AzureIntegrationMigration.BizTalk.Convert/Microsoft.AzureIntegrationMigration.BizTalk.Convert.csproj @@ -33,7 +33,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Microsoft.AzureIntegrationMigration.BizTalk.Discover/Microsoft.AzureIntegrationMigration.BizTalk.Discover.csproj b/src/Microsoft.AzureIntegrationMigration.BizTalk.Discover/Microsoft.AzureIntegrationMigration.BizTalk.Discover.csproj index c2dc0f7..ae38afc 100644 --- a/src/Microsoft.AzureIntegrationMigration.BizTalk.Discover/Microsoft.AzureIntegrationMigration.BizTalk.Discover.csproj +++ b/src/Microsoft.AzureIntegrationMigration.BizTalk.Discover/Microsoft.AzureIntegrationMigration.BizTalk.Discover.csproj @@ -36,7 +36,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Microsoft.AzureIntegrationMigration.BizTalk.Parse/Microsoft.AzureIntegrationMigration.BizTalk.Parse.csproj b/src/Microsoft.AzureIntegrationMigration.BizTalk.Parse/Microsoft.AzureIntegrationMigration.BizTalk.Parse.csproj index a35d8ff..da00ed3 100644 --- a/src/Microsoft.AzureIntegrationMigration.BizTalk.Parse/Microsoft.AzureIntegrationMigration.BizTalk.Parse.csproj +++ b/src/Microsoft.AzureIntegrationMigration.BizTalk.Parse/Microsoft.AzureIntegrationMigration.BizTalk.Parse.csproj @@ -25,7 +25,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Microsoft.AzureIntegrationMigration.BizTalk.Report/Microsoft.AzureIntegrationMigration.BizTalk.Report.csproj b/src/Microsoft.AzureIntegrationMigration.BizTalk.Report/Microsoft.AzureIntegrationMigration.BizTalk.Report.csproj index f2a1e13..97da3bf 100644 --- a/src/Microsoft.AzureIntegrationMigration.BizTalk.Report/Microsoft.AzureIntegrationMigration.BizTalk.Report.csproj +++ b/src/Microsoft.AzureIntegrationMigration.BizTalk.Report/Microsoft.AzureIntegrationMigration.BizTalk.Report.csproj @@ -26,7 +26,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Microsoft.AzureIntegrationMigration.BizTalk.StageRunners/Microsoft.AzureIntegrationMigration.BizTalk.StageRunners.csproj b/src/Microsoft.AzureIntegrationMigration.BizTalk.StageRunners/Microsoft.AzureIntegrationMigration.BizTalk.StageRunners.csproj index a0c4bbd..eedb82f 100644 --- a/src/Microsoft.AzureIntegrationMigration.BizTalk.StageRunners/Microsoft.AzureIntegrationMigration.BizTalk.StageRunners.csproj +++ b/src/Microsoft.AzureIntegrationMigration.BizTalk.StageRunners/Microsoft.AzureIntegrationMigration.BizTalk.StageRunners.csproj @@ -26,8 +26,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Microsoft.AzureIntegrationMigration.BizTalk.Types/Microsoft.AzureIntegrationMigration.BizTalk.Types.csproj b/src/Microsoft.AzureIntegrationMigration.BizTalk.Types/Microsoft.AzureIntegrationMigration.BizTalk.Types.csproj index 9335d72..715c346 100644 --- a/src/Microsoft.AzureIntegrationMigration.BizTalk.Types/Microsoft.AzureIntegrationMigration.BizTalk.Types.csproj +++ b/src/Microsoft.AzureIntegrationMigration.BizTalk.Types/Microsoft.AzureIntegrationMigration.BizTalk.Types.csproj @@ -25,7 +25,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.Tests.csproj b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.Tests.csproj index c63ad10..5a41cb6 100644 --- a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.Tests.csproj +++ b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Analyze.Tests.csproj @@ -33,7 +33,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Cli.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Cli.Tests.csproj b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Cli.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Cli.Tests.csproj index 67f3bde..5fc68ae 100644 --- a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Cli.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Cli.Tests.csproj +++ b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Cli.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Cli.Tests.csproj @@ -6,7 +6,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Convert.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Convert.Tests.csproj b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Convert.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Convert.Tests.csproj index d2f8b09..b410099 100644 --- a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Convert.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Convert.Tests.csproj +++ b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Convert.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Convert.Tests.csproj @@ -16,7 +16,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Discover.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Discover.Tests.csproj b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Discover.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Discover.Tests.csproj index 2f28fee..d803f93 100644 --- a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Discover.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Discover.Tests.csproj +++ b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Discover.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Discover.Tests.csproj @@ -16,7 +16,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Parse.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Parse.Tests.csproj b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Parse.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Parse.Tests.csproj index 9d45462..1feab7b 100644 --- a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Parse.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Parse.Tests.csproj +++ b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Parse.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Parse.Tests.csproj @@ -24,7 +24,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Report.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Report.Tests.csproj b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Report.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Report.Tests.csproj index 7fee250..2b98181 100644 --- a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Report.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Report.Tests.csproj +++ b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Report.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Report.Tests.csproj @@ -25,7 +25,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Types.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Types.Tests.csproj b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Types.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Types.Tests.csproj index ed0c8d5..8999034 100644 --- a/tests/Microsoft.AzureIntegrationMigration.BizTalk.Types.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Types.Tests.csproj +++ b/tests/Microsoft.AzureIntegrationMigration.BizTalk.Types.Tests/Microsoft.AzureIntegrationMigration.BizTalk.Types.Tests.csproj @@ -24,7 +24,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive