workflow

Author: adrianstephens

.github/workflows/auto-merge-upstream.yml

@@ -1,9 +1,10 @@
-name: Auto Merge Upstream and Publish
+
+name: Auto Merge Upstream and Publish Operators
 
 on:
+  workflow_dispatch:
   schedule:
     - cron: '0 3 * * *'
-  workflow_dispatch:
 
 jobs:
   merge-build-publish:
@@ -13,26 +14,38 @@ jobs:
         uses: actions/checkout@v4
         with:
           persist-credentials: false
+          fetch-depth: 0
 
-      - name: Set up git
+      - name: Set up git and fetch branches
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
+          git remote add upstream https://github.com/microsoft/TypeScript.git || true
+          git fetch upstream
+          git fetch origin operators
 
-      - name: Add upstream remote
-        run: git remote add upstream https://github.com/microsoft/TypeScript.git
+      - name: Merge upstream/main into main
+        run: |
+          git checkout main
+          git merge upstream/main
 
-      - name: Fetch upstream
-        run: git fetch upstream
+      - name: Push merged changes to main
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: git push origin HEAD:main
 
-      - name: Merge upstream/main
-        run: git merge upstream/main
+      - name: Merge operators into main
+        run: |
+          git merge origin/operators
 
-      - name: Push changes
+      - name: Push merged changes to operators
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: git push origin HEAD:operators
 
+      - name: Checkout operators branch
+        run: git checkout operators
+
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
@@ -48,7 +61,9 @@ jobs:
         run: npx hereby LKG
 
       - name: Publish to npm
-        if: success()  # Only publish if the previous steps were successful
+        if: success()
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
           npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
           npm publish --access public