Merged master

.github/workflows/CreateRelease.yml

@@ -6,45 +6,75 @@ on:
 jobs:
   CreateRelease:
     runs-on: ubuntu-latest
+
     steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v2
-        with:
-          ref: AssetStoreRelease
+    - name: Checkout Repository
+      uses: actions/checkout@v3
 
-      - name: Merge master into AssetStoreRelease
-        run: |
-          git fetch origin master --depth 1
-          git reset --hard origin/master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - name: Merge Master into AssetStoreRelease
+      uses: devmasx/merge-branch@master
+      with:
+        type: now
+        from_branch: master
+        target_branch: AssetStoreRelease
+        message: "Merged master"
+        github_token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up .NET Core
-        uses: actions/setup-dotnet@v1
+    #- name: Set Git Config
+    #  run: |
+    #    git config user.name ${{ secrets.COMMITTER_NAME }}
+    #    git config user.email ${{ secrets.COMMITTER_EMAIL }}
 
-      - name: Install dotnet-script
-        run: |
-          dotnet tool install -g dotnet-script
-          dotnet script --version
+    #- name: Merge Master into AssetStoreRelease
+    #  run: |
+    #    git fetch --unshallow
+    #    git checkout -b AssetStoreRelease
+    #    git pull
+    #    git merge --no-ff master -m "Merged master"
+    #    git push
 
-      - name: Run CreateRelease.cs
-        run: |
-          dotnet script .github/CreateRelease.cs
+#jobs:
+#  CreateRelease:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Checkout Repo
+#        uses: actions/checkout@v2
+#        with:
+#          ref: AssetStoreRelease
 
-      - name: Commit and Push
-        run: |
-          git config --local user.name ${{ secrets.COMMITTER_NAME }}
-          git config --local user.email ${{ secrets.COMMITTER_EMAIL }}
-          git add Assets/Mirror/version.txt
-          git commit -m "release!: Asset Store Release" -a
+#      - name: Merge master into AssetStoreRelease
+#        run: |
+#          git fetch origin master --depth 1
+#          git reset --hard origin/master
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-          # Configure Git to rebase when pulling
-          git config --local pull.rebase true
+#      - name: Set up .NET Core
+#        uses: actions/setup-dotnet@v1
 
-          # Perform a git pull to update the local branch with remote changes
-          git pull origin AssetStoreRelease
+#      - name: Install dotnet-script
+#        run: |
+#          dotnet tool install -g dotnet-script
+#          dotnet script --version
 
-          # Push the updated branch to the remote
-          git push origin AssetStoreRelease
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#      - name: Run CreateRelease.cs
+#        run: |
+#          dotnet script .github/CreateRelease.cs
+
+#      - name: Commit and Push
+#        run: |
+#          git config --local user.name ${{ secrets.COMMITTER_NAME }}
+#          git config --local user.email ${{ secrets.COMMITTER_EMAIL }}
+#          git add Assets/Mirror/version.txt
+#          git commit -m "release!: Asset Store Release" -a
+
+#          # Configure Git to rebase when pulling
+#          git config --local pull.rebase true
+
+#          # Perform a git pull to update the local branch with remote changes
+#          git pull origin AssetStoreRelease
+
+#          # Push the updated branch to the remote
+#          git push origin AssetStoreRelease
+#        env:
+#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}