From c196780e99ea45d4333c6a37d51b73c86b4bc429 Mon Sep 17 00:00:00 2001
From: Joe Previte <jjprevite@gmail.com>
Date: Fri, 28 Oct 2022 10:11:40 -0700
Subject: [PATCH] fix: merge in master from coder/code-server-aur

This ensures that the branch is up-to-date with coder/code-server-aur
before opening a PR.
---
 .github/workflows/publish.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 08ea0aeacf98..569a9384d4b2 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -97,6 +97,12 @@ jobs:
           token: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}
           ref: "master"
 
+      - name: Merge in master
+        run: |
+          git remote add upstream https://github.com/coder/code-server-aur.git
+          git fetch upstream
+          git merge upstream/master
+
       - name: Configure git
         run: |
           git config --global user.name cdrci