From 1354f1fb9008585f0ed5e7274e58ea42d4a25fe9 Mon Sep 17 00:00:00 2001 From: Bobby Stocker Date: Tue, 26 Jul 2022 23:58:48 -0700 Subject: [PATCH 1/4] Create main.yml --- .github/workflows/main.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000000000..136e7f480813b --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,14 @@ + +name: Sync VSCode fork + +on: + workflow_dispatch: + schedule: + - cron: "0 13 * * 1" + +jobs: + sync: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@2 From 16a5bdfb8cc2371a80cf67e160115c5f59a49fea Mon Sep 17 00:00:00 2001 From: Bobby Stocker Date: Wed, 27 Jul 2022 00:05:36 -0700 Subject: [PATCH 2/4] Update main.yml --- .github/workflows/main.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 136e7f480813b..419447bdd0576 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,3 +12,17 @@ jobs: steps: - uses: actions/checkout@2 + + - name: Sync and merge upstream repository with your current repository + # You may pin to the exact commit or the version. + # uses: dabreadman/sync-upstream-repo@fc5fe9952946b1daaafd9abd7fcd7e260b81ddbe + uses: dabreadman/sync-upstream-repo@v1.3.0 + with: + # URL of gitHub public upstream repo + upstream_repo: https://github.com/microsoft/vscode + # Branch to merge from upstream (defaults to downstream branch) + upstream_branch: main + # Branch to merge into downstream + downstream_branch: main + # GitHub Bot token + token: ${{ secrets.GITHUB_TOKEN }} From 25d69d4281e45757462208768f4a5e80bb3a7c97 Mon Sep 17 00:00:00 2001 From: Bobby Stocker Date: Wed, 27 Jul 2022 00:08:20 -0700 Subject: [PATCH 3/4] Fixed incorrect syntax --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 419447bdd0576..70db236b9d7f7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@2 + - uses: actions/checkout@v2 - name: Sync and merge upstream repository with your current repository # You may pin to the exact commit or the version. From 31ad877ff8ec7d51349301a8b75cd4a4b06449f9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Oct 2022 16:39:45 +0000 Subject: [PATCH 4/4] Bump actions/setup-python from 2 to 4 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 4. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- .github/workflows/deep-classifier-runner.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fbc0876623de3..d750abbc53043 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: with: node-version: 16 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: python-version: "2.x" diff --git a/.github/workflows/deep-classifier-runner.yml b/.github/workflows/deep-classifier-runner.yml index a966318ddef89..c951476c08392 100644 --- a/.github/workflows/deep-classifier-runner.yml +++ b/.github/workflows/deep-classifier-runner.yml @@ -33,7 +33,7 @@ jobs: token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}} appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}} - name: Set up Python 3.7 - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: 3.7 - name: Install dependencies