Skip to content

Commit

Permalink
Merge branch 'main' into bug/fix-version-detector
Browse files Browse the repository at this point in the history
  • Loading branch information
MrHinsh authored Jul 24, 2024
2 parents baa6f7e + 318340c commit 6e23abb
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 7 deletions.
33 changes: 33 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Add 'Documentation' label to any changes within 'docs' folder or any subfolders
documentation:
- changed-files:
- any-glob-to-any-file: docs/**

# Add 'source' label to any change to src files within the source dir EXCEPT for the docs sub-folder
build-action:
- changed-files:
- any-glob-to-any-file: ['build/**', '.github/workflows/**']
- head-branch: ['^build', 'build']

enhancement:
- changed-files:
- any-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*/**']

# Add 'feature' label to any PR where the head branch name starts with `feature` or has a `feature` section in the name
feature:
- head-branch: ['^feature', 'feature', '^topic', 'topic']

# Add 'bug' label to any PR
bug:
- head-branch: ['^fix', 'fix','^bug', 'bug']


6 changes: 3 additions & 3 deletions .github/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ changelog:
- '*'
exclude:
labels:
- dependencies
- title: 👒 Dependencies
- architecture
- title: 👒 Architecture Improvements
labels:
- dependencies
- architecture
2 changes: 1 addition & 1 deletion .github/workflows/code-review.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Code Review
name: OpenAI - Code Review

permissions:
contents: read
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: "Pull Request Labeler"
on:
- pull_request_target

jobs:
labeler:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v5
with:
sync-labels: true
23 changes: 22 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
HasChanged_docs: ${{ steps.filter.outputs.docs }}
HasChanged_automation: ${{ steps.filter.outputs.automation }}
nkdAgility_Ring: ${{ steps.nkdagility.outputs.Ring }}
nkdAgility_WingetApplicationId: ${{ steps.nkdagility.outputs.WingetApplicationId }}
nkdAgility_IsBuildEditBranch: ${{ steps.nkdagility.outputs.IsBuildEditBranch }}
steps:
- name: Checkout
Expand Down Expand Up @@ -71,19 +72,25 @@ jobs:
id: nkdagility
run: |
$Ring = "Canary"
$WingetApplicationId = "nkdagility.azure-devops-migration-tools"
switch ($Env:GitVersion_PreReleaseLabel) {
"" {
$Ring = "Release";
$WingetApplicationId = "nkdagility.azure-devops-migration-tools";
}
"Preview" {
$Ring = "Preview";
$WingetApplicationId = "nkdagility.azure-devops-migration-tools.Preview";
}
default {
$Ring = "Canary";
$WingetApplicationId = "nkdagility.azure-devops-migration-tools.Canary";
}
}
Write-Output "We are running for the $Ring Ring!"
echo "Ring=$Ring" >> $env:GITHUB_OUTPUT
Write-Output "We are focused on Winget ID $WingetApplicationId!"
echo "Ring=$Ring" >> $env:GITHUB_OUTPUT
echo "WingetApplicationId=$WingetApplicationId" >> $env:GITHUB_OUTPUT
$IsBuildEditBranch = $false;
if (("${{ github.ref_name }}").contains("build/")) {
Expand All @@ -108,6 +115,7 @@ jobs:
### NKDAgility
- nkdAgility_Ring: ${{needs.Setup.outputs.nkdAgility_Ring}}
- nkdAgility_IsBuildEditBranch: ${{needs.Setup.outputs.nkdAgility_IsBuildEditBranch}}
- nkdAgility_WingetApplicationId: ${{needs.Setup.outputs.nkdAgility_WingetApplicationId}}
### GitVersion
- GitVersion_BranchName: ${{needs.Setup.outputs.GitVersion_BranchName}}
- GitVersion_SemVer: ${{needs.Setup.outputs.GitVersion_SemVer}}
Expand Down Expand Up @@ -271,6 +279,7 @@ jobs:
if ($Env:nkdAgility_Ring -ne 'Canary' && ($Env:HasChanged_src || $Env:HasChanged_docs )) {
echo "discussion_category_name=Anouncement" >> $env:GITHUB_OUTPUT
}
- name: Release
uses: softprops/action-gh-release@v2
with:
Expand All @@ -285,6 +294,18 @@ jobs:
prerelease: ${{ needs.Setup.outputs.nkdAgility_Ring != 'Release' }}
discussion_category_name: ${{ steps.release-options.outputs.discussion_category_name }}
draft: ${{ needs.Setup.outputs.nkdAgility_Ring == 'Canary' }}
body: |
## Azure DevOps Migration Tools v${{ needs.Setup.outputs.GitVersion_SemVer }}
Version: ${{ needs.Setup.outputs.GitVersion_SemVer }}
Ring: (${{ needs.Setup.outputs.nkdAgility_Ring }})
## Get the tools
- Download the [MigrationTools-${{ needs.Setup.outputs.GitVersion_SemVer }}.zip](https://github.com/nkdAgility/azure-devops-migration-tools/releases/download/v${{ needs.Setup.outputs.GitVersion_SemVer }}/MigrationTools-${{ needs.Setup.outputs.GitVersion_SemVer }}.zip) file below
- Install with Winget with `winget install ${{needs.Setup.outputs.nkdAgility_WingetApplicationId}} --version ${{ needs.Setup.outputs.GitVersion_SemVer }}` . There is a delay for aprovals on the winget store, so you may need to wait a few days before this is available.
- Install with Chocolatey with `choco install nkdagility.azure-devops-migration-tools --version ${{ needs.Setup.outputs.GitVersion_NuGetVersion }}`. There is a delay for aprovals on the chocolatey store, so you may need to wait a few hours before this is available.
append_body: true

# ElmahDeployment
ElmahDeployemnt:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/open-pr-describer.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: OpenAI PR Description Generator
name: "OpenAI - PR Description Generator"

on:
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/opencommit.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'OpenCommit AI'
name: 'OpenAI - OpenCommit AI'

permissions:
contents: write
Expand Down

0 comments on commit 6e23abb

Please sign in to comment.