Skip to content

Commit

Permalink
Create a main-v10 branch
Browse files Browse the repository at this point in the history
  • Loading branch information
nirinchev committed Apr 20, 2023
1 parent 714e6b3 commit 0eac7ab
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/templates/common.lib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#@ actionFindPR = "juliangruber/find-pull-request-action@afdd62ccd2d4c55f5bdb154b489b85fc4cbcb9c1" #! 1.5.0
#@ actionMergePR = "juliangruber/merge-pull-request-action@333730196b34b74936aad75a4e31c23a57582d14" #! 1.0.6

#@ mainBranch = "main"
#@ mainBranch = "main-v10"
---

#@ def setupNugetCache(projectPaths = []):
Expand Down
4 changes: 2 additions & 2 deletions .github/templates/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#@ load("@ytt:template", "template")
#@ load("common.lib.yml", "checkoutCode", "uploadArtifacts", "setupDotnet", "uploadPackagesToSleet", "cleanupWorkspace", "dotnetPublish", "actionDownloadArtifact")
#@ load("common.lib.yml", "checkoutCode", "uploadArtifacts", "setupDotnet", "uploadPackagesToSleet", "cleanupWorkspace", "dotnetPublish", "actionDownloadArtifact", "mainBranch")
#@ load("test.lib.yml", "dotnetBuildTests")
#@ load("build.lib.yml", "deployBaas", "cleanupBaas", "runTests", "runNetCoreTests", "ignoreSkippedJobsCondition", "buildUnity")

Expand All @@ -17,7 +17,7 @@ name: main
"on":
push:
branches:
- main
- #@ mainBranch
workflow_dispatch:
inputs:
publish-prerelease:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: main
"on":
push:
branches:
- main
- main-v10
workflow_dispatch:
inputs:
publish-prerelease:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
artifacts: Realm/packages/io.realm.unity-${{ steps.get-version.outputs.version }}.tgz/io.realm.unity-${{ steps.get-version.outputs.version }}.tgz
bodyFile: Realm/packages/ExtractedChangelog/ExtractedChangelog.md
name: ${{ steps.get-version.outputs.version }}
commit: main
commit: main-v10
tag: ${{ steps.get-version.outputs.version }}
token: ${{ secrets.GITHUB_TOKEN }}
draft: false
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
title: Prepare for vNext
body: Update Changelog for vNext
delete-branch: true
base: main
base: main-v10
commit-message: Prepare for vNext
- name: Merge Pull Request
uses: juliangruber/merge-pull-request-action@333730196b34b74936aad75a4e31c23a57582d14
Expand Down

0 comments on commit 0eac7ab

Please sign in to comment.