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 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000000000..70db236b9d7f7 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,28 @@ + +name: Sync VSCode fork + +on: + workflow_dispatch: + schedule: + - cron: "0 13 * * 1" + +jobs: + sync: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - 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 }}