Skip to content

Commit

Permalink
Merge branch 'main' into build/better-release-description
Browse files Browse the repository at this point in the history
  • Loading branch information
MrHinsh authored Aug 8, 2024
2 parents ce562a2 + d97dc7d commit 3c38499
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
5 changes: 2 additions & 3 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,15 @@ build-action:

enhancement:
- changed-files:
- any-glob-to-any-file: ['src/**']
- all-glob-to-any-file: ['src/**']

enhancement-classic:
- changed-files:
- any-glob-to-any-file: ['src/MigrationTools/_EngineV1/**', 'src/VstsSyncMigrator*/**']

enhancement-modern:
- changed-files:
- any-glob-to-any-file: ['src/**']
- all-globs-to-all-files: ['!src/MigrationTools/_EngineV1/**', '!src/VstsSyncMigrator*/**']
- all-globs-to-any-files: ['src/**', '!src/MigrationTools/_EngineV1/**', '!src/VstsSyncMigrator*/**']

# Add 'feature' label to any PR where the head branch name starts with `feature` or has a `feature` section in the name
feature:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ jobs:
name: "Build, Test, Sonar Cloud Analysis, & Package"
runs-on: windows-latest
needs: Setup
if: ${{ success() && ( needs.Setup.outputs.HasChanged_src ) }}
if: ${{ success() }}
env:
solution: '**/*.sln'
buildPlatform: 'Any CPU'
Expand Down Expand Up @@ -251,7 +251,7 @@ jobs:
BuildDocs:
name: "Build Documentation output"
runs-on: ubuntu-latest
if: ${{ success() && ( needs.Setup.outputs.HasChanged_docs ) }}
if: ${{ success() }}
needs: [Setup]
env:
GitVersion_SemVer: ${{ needs.Setup.outputs.GitVersion_SemVer }}
Expand Down Expand Up @@ -290,7 +290,7 @@ jobs:
HasChanged_docs: ${{ needs.Setup.outputs.HasChanged_docs }}
HasChanged_automation: ${{ needs.Setup.outputs.HasChanged_automation }}
needs: [build, Setup]
if: ${{ success() && ( needs.Setup.outputs.nkdAgility_Ring != 'Canary' ) && ( needs.Setup.outputs.HasChanged_src ) }}
if: ${{ success() && ( needs.Setup.outputs.nkdAgility_Ring != 'Canary' ) && ( needs.Setup.outputs.HasChanged_src == 'true' ) }}
steps:
- uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -370,7 +370,7 @@ jobs:
name: "Release to Marketplace"
runs-on: ubuntu-latest
needs: [Setup, GitHubRelease]
if: ${{ success() && ( needs.Setup.outputs.nkdAgility_Ring != 'Canary' ) && (needs.Setup.outputs.HasChanged_src) }}
if: ${{ success() && ( needs.Setup.outputs.nkdAgility_Ring != 'Canary' ) && (needs.Setup.outputs.HasChanged_src == 'true') }}
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down Expand Up @@ -399,7 +399,7 @@ jobs:
name: "Release to Chocolatey"
runs-on: windows-latest
needs: [Setup, GitHubRelease]
if: ${{ success() && ( needs.Setup.outputs.nkdAgility_Ring != 'Canary' ) && (needs.Setup.outputs.HasChanged_src) }}
if: ${{ success() && ( needs.Setup.outputs.nkdAgility_Ring != 'Canary' ) && (needs.Setup.outputs.HasChanged_src == 'true') }}
steps:
- uses: actions/download-artifact@v4
with:
Expand All @@ -423,7 +423,7 @@ jobs:
name: "Release to Winget"
runs-on: windows-latest
needs: [Setup, GitHubRelease]
if: ${{ success() && ( needs.Setup.outputs.nkdAgility_Ring != 'Canary' ) && (needs.Setup.outputs.HasChanged_src) }}
if: ${{ success() && ( needs.Setup.outputs.nkdAgility_Ring != 'Canary' ) && (needs.Setup.outputs.HasChanged_src == 'true') }}
steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -444,7 +444,7 @@ jobs:
name: "Release to Docs"
runs-on: ubuntu-latest
needs: [Setup, BuildDocs, GitHubRelease]
if: ${{ success() && ( needs.Setup.outputs.nkdAgility_Ring != 'Canary' ) }}
if: ${{ success() && ( needs.Setup.outputs.nkdAgility_Ring != 'Canary' ) && (needs.Setup.outputs.HasChanged_docs == 'true') }}
steps:
- name: Download a single artifact
uses: actions/download-artifact@v4
Expand Down

0 comments on commit 3c38499

Please sign in to comment.