From 0162807ea165744240c0330fd27993378d723cc7 Mon Sep 17 00:00:00 2001 From: User Date: Fri, 25 Aug 2023 15:26:38 +0300 Subject: [PATCH] Improve workflows ordering --- .github/workflows/monthly-copyright-update.yml | 4 ++-- .github/workflows/nightly-package-update.yml | 4 ++-- ...ightly-pr-to-main.yml => nightly-prs-to-main.yml} | 4 ++-- .github/workflows/nightly-publish-main.yml | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) rename .github/workflows/{nightly-pr-to-main.yml => nightly-prs-to-main.yml} (95%) diff --git a/.github/workflows/monthly-copyright-update.yml b/.github/workflows/monthly-copyright-update.yml index 4b9d3bd..a45e013 100644 --- a/.github/workflows/monthly-copyright-update.yml +++ b/.github/workflows/monthly-copyright-update.yml @@ -12,5 +12,5 @@ jobs: uses: 51Degrees/common-ci/.github/workflows/monthly-copyright-update.yml@main with: repo-name: ${{ github.event.repository.name }} - secrets: - token: ${{ secrets.ACCESS_TOKEN }} \ No newline at end of file + secrets: + token: ${{ secrets.ACCESS_TOKEN }} diff --git a/.github/workflows/nightly-package-update.yml b/.github/workflows/nightly-package-update.yml index 22c397b..440ba36 100644 --- a/.github/workflows/nightly-package-update.yml +++ b/.github/workflows/nightly-package-update.yml @@ -11,5 +11,5 @@ jobs: uses: 51Degrees/common-ci/.github/workflows/nightly-package-update.yml@main with: repo-name: ${{ github.event.repository.name }} - secrets: - token: ${{ secrets.ACCESS_TOKEN }} \ No newline at end of file + secrets: + token: ${{ secrets.ACCESS_TOKEN }} diff --git a/.github/workflows/nightly-pr-to-main.yml b/.github/workflows/nightly-prs-to-main.yml similarity index 95% rename from .github/workflows/nightly-pr-to-main.yml rename to .github/workflows/nightly-prs-to-main.yml index 4430e25..5a5fd29 100644 --- a/.github/workflows/nightly-pr-to-main.yml +++ b/.github/workflows/nightly-prs-to-main.yml @@ -1,4 +1,4 @@ -name: Nigthly PR to Main +name: Nightly PRs to Main on: workflow_dispatch: @@ -12,6 +12,6 @@ jobs: uses: 51Degrees/common-ci/.github/workflows/nightly-prs-to-main.yml@main with: repo-name: ${{ github.event.repository.name }} - secrets: + secrets: token: ${{ secrets.ACCESS_TOKEN }} asset-keys: '{ "DeviceDetection": "${{ secrets.DEVICE_DETECTION_KEY }}","DeviceDetectionUrl": "${{ secrets.DEVICE_DETECTION_URL }}", "TestResourceKey": "${{ secrets.SUPER_RESOURCE_KEY}}","AcceptCHBrowserKey" : "${{ secrets.ACCEPTCH_BROWSER_KEY}}","AcceptCHHardwareKey" : "${{ secrets.ACCEPTCH_HARDWARE_KEY}}","AcceptCHPlatformKey" : "${{ secrets.ACCEPTCH_PLATFORM_KEY}}","AcceptCHNoneKey" : "${{ secrets.ACCEPTCH_NONE_KEY}}" }' diff --git a/.github/workflows/nightly-publish-main.yml b/.github/workflows/nightly-publish-main.yml index 73a9089..c4f1eea 100644 --- a/.github/workflows/nightly-publish-main.yml +++ b/.github/workflows/nightly-publish-main.yml @@ -1,11 +1,11 @@ -name: Nigthly Publish Main +name: Nightly Publish Main on: workflow_dispatch: - schedule: - # * is a special character in YAML so quote this string - - cron: '0 1 * * *' - + workflow_run: + workflows: [Nightly PRs to Main] + types: [completed] + jobs: # Run the common workflow to test and publish the main branch Nightly_Publish_Main: @@ -13,6 +13,6 @@ jobs: with: repo-name: ${{ github.event.repository.name }} build-platform: windows-latest - secrets: + secrets: token: ${{ secrets.ACCESS_TOKEN }} asset-keys: '{ "ApiKey": "${{ secrets.NUGET_API_KEY }}", "CodeSigningCertPassword" : "${{ secrets.CODE_SIGNING_CERT_PASSWORD }}", "CodeSigningCert" : "${{ secrets.CODE_SIGNING_CERT }}", "DeviceDetection": "${{ secrets.DEVICE_DETECTION_KEY }}","DeviceDetectionUrl": "${{ secrets.DEVICE_DETECTION_URL }}","TestResourceKey": "${{ secrets.SUPER_RESOURCE_KEY}}","AcceptCHBrowserKey" : "${{ secrets.ACCEPTCH_BROWSER_KEY}}","AcceptCHHardwareKey" : "${{ secrets.ACCEPTCH_HARDWARE_KEY}}","AcceptCHPlatformKey" : "${{ secrets.ACCEPTCH_PLATFORM_KEY}}","AcceptCHNoneKey" : "${{ secrets.ACCEPTCH_NONE_KEY}}" }'