Skip to content

Commit bb69d13

Browse files
Another deployment check (#103)
1 parent db990c5 commit bb69d13

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

.github/workflows/deploy-module.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
with:
3737
ref: ${{ github.head_ref }} # checkout the correct branch name
3838
fetch-depth: 0
39+
token: ${{ secrets.REPO_TOKEN }}
3940
- name: Install GitVersion
4041
uses: gittools/actions/gitversion/[email protected]
4142
with:
@@ -86,11 +87,15 @@ jobs:
8687
GalleryApiToken: ${{ secrets.GalleryApiToken }}
8788
ReleaseBranch: main
8889
MainGitBranch: main
90+
- name: Set Git config
91+
run: |
92+
git config --local user.email "[email protected]"
93+
git config --local user.name "Github Actions"
8994
- name: Merge main -> develop
90-
# This step merges the main branch into the develop branch after a successful deployment. This ensures that the develop branch includes the tag for the latest release.
91-
uses: devmasx/[email protected]
92-
with:
93-
type: now
94-
from_branch: main
95-
target_branch: develop
96-
github_token: ${{ secrets.REPO_TOKEN }}
95+
# This step merges the main branch into the develop branch after a successful deployment. This ensures that the develop branch includes the tag for the latest release.
96+
run: |
97+
git fetch --unshallow
98+
git checkout develop
99+
git pull
100+
git merge --no-ff main -m "Auto-merge main back to dev"
101+
git push

source/Public/Get-FabricDebugInfo.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ function Get-FabricDebugInfo {
1515
This example shows the current session object.
1616
1717
.NOTES
18+
AUTHOR: Somebody wrote this
1819
1920
#>
2021

source/Public/Get-SHA256.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
function Get-Sha256 ($string) {
3-
<#
3+
<#
44
.SYNOPSIS
55
Calculates the SHA256 hash of a string.
66
@@ -34,4 +34,4 @@ The function creates a new SHA256CryptoServiceProvider object, converts the stri
3434

3535
# Return the resulting hash.
3636
return $result
37-
}
37+
}

0 commit comments

Comments
 (0)