Merged master

This commit is contained in:
MrGadget1024 2023-11-08 11:47:18 -05:00
commit fda35294f8

View File

@ -4,18 +4,18 @@ on:
workflow_dispatch: workflow_dispatch:
jobs: jobs:
modify-and-commit: CreateRelease:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout Repo - name: Checkout Repo
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
ref: master ref: AssetStoreRelease
- name: Merge master into AssetStoreRelease - name: Merge master into AssetStoreRelease
run: | run: |
git checkout AssetStoreRelease git fetch origin master --depth 1
git merge master git rebase origin/master
- name: Set up .NET Core - name: Set up .NET Core
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1