Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 * Fixes and cleanup * Distro * Fix hygiene yarn * delete no yarn lock changes file * Fix hygiene * Fix layer check * Fix CI * Skip lib checks * Remove tests deleted in vs code * Fix tests * Distro * Fix tests and add removed extension point * Skip failing notebook tests for now * Disable broken tests and cleanup build folder * Update yarn.lock and fix smoke tests * Bump sqlite * fix contributed actions and file spacing * Fix user data path * Update yarn.locks Co-authored-by: ADS Merger <karlb@microsoft.com>
2026-01-13 17:22:15 -05:00 · 2021-06-17 08:17:11 -07:00
parent fdcb97c7f7
commit 3cb2f552a6
2582 changed files with 124827 additions and 87099 deletions
--- a/.github/workflows/build-chat.yml
+++ b/.github/workflows/build-chat.yml
@@ -7,7 +7,7 @@ on:
    types:
      - completed
    branches:
-      - master
+      - main
      - release/*

 jobs:
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,161 +11,296 @@ on:
      - release/*

 jobs:
+  windows:
+      name: Windows
+      runs-on: windows-latest
+      timeout-minutes: 30
+      env:
+        CHILD_CONCURRENCY: "1"
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      steps:
+        - uses: actions/checkout@v2.2.0
+
+        - uses: actions/setup-node@v2
+          with:
+            node-version: 12
+
+        - uses: actions/setup-python@v2
+          with:
+            python-version: "2.x"
+
+        # {{SQL CARBON EDIT}} Skip caching for now
+        # - name: Compute node modules cache key
+        #   id: nodeModulesCacheKey
+        #   run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
+        # - name: Cache node_modules archive
+        #   id: cacheNodeModules
+        #   uses: actions/cache@v2
+        #   with:
+        #     path: ".build/node_modules_cache"
+        #     key: "${{ runner.os }}-cacheNodeModulesArchive-${{ steps.nodeModulesCacheKey.outputs.value }}"
+        # - name: Extract node_modules archive
+        #   if: ${{ steps.cacheNodeModules.outputs.cache-hit == 'true' }}
+        #   run: 7z.exe x .build/node_modules_cache/cache.7z -aos
+        # - name: Get yarn cache directory path
+        #   id: yarnCacheDirPath
+        #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        #   run: echo "::set-output name=dir::$(yarn cache dir)"
+        # - name: Cache yarn directory
+        #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        #   uses: actions/cache@v2
+        #   with:
+        #     path: ${{ steps.yarnCacheDirPath.outputs.dir }}
+        #     key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+        #     restore-keys: ${{ runner.os }}-yarnCacheDir-
+
+        - name: Execute yarn
+          # if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} {{SQL CARBON EDIT}} Skipping caching for now
+          env:
+            PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+            ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+          run: yarn --frozen-lockfile --network-timeout 180000
+        # - name: Create node_modules archive {{SQL CARBON EDIT}} Skip caching for now
+        #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        #   run: |
+        #     mkdir -Force .build
+        #     node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
+        #     mkdir -Force .build/node_modules_cache
+        #     7z.exe a .build/node_modules_cache/cache.7z -mx3 `@.build/node_modules_list.txt
+
+        - name: Compile and Download
+          run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" # {{SQL CARBON EDIT}} Remove unused options playwright-install download-builtin-extensions
+
+        - name: Run Unit Tests (Electron)
+          run: .\scripts\test.bat
+
+        # - name: Run Unit Tests (Browser) {{SQL CARBON EDIT}} disable for now
+        #   run: yarn test-browser --browser chromium
+
+        # - name: Run Integration Tests (Electron) {{SQL CARBON EDIT}} disable for now
+        #   run: .\scripts\test-integration.bat
+
  linux:
+    name: Linux
    runs-on: ubuntu-latest
+    timeout-minutes: 30
    env:
-      CHILD_CONCURRENCY: "1"
      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
    steps:
      - uses: actions/checkout@v2.2.0
+
      # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
-      - run: |
+      - name: Setup Build Environment
+        run: |
          sudo apt-get update
-          sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libkrb5-dev # {{SQL CARBON EDIT}} add kerberos dep
+          sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libgbm1 libkrb5-dev # {{SQL CARBON EDIT}} add kerberos dep
          sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
          sudo chmod +x /etc/init.d/xvfb
          sudo update-rc.d xvfb defaults
          sudo service xvfb start
-        name: Setup Build Environment
-      - uses: actions/setup-node@v1
+
+      - uses: actions/setup-node@v2
        with:
          node-version: 12
-      # TODO: cache node modules
-      # Increase timeout to get around latency issues when fetching certain packages
-      - run: |
-          yarn config set network-timeout 300000
-          yarn --frozen-lockfile
-        name: Install Dependencies
-      - run: yarn electron x64
-        name: Download Electron
-      - run: yarn gulp hygiene
-        name: Run Hygiene Checks
-      - run: yarn strict-vscode # {{SQL CARBON EDIT}} add step
-        name: Run Strict Compile Options
-      # - run: yarn monaco-compile-check {{SQL CARBON EDIT}} remove step
-      #   name: Run Monaco Editor Checks
-      - run: yarn valid-layers-check
-        name: Run Valid Layers Checks
-      - run: yarn compile
-        name: Compile Sources
-      # - run: yarn download-builtin-extensions {{SQL CARBON EDIT}} remove step
-      #   name: Download Built-in Extensions
-      - run: DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests" --coverage --runGlob "**/sql/**/*.test.js"
-        name: Run Unit Tests (Electron)
-      - run: DISPLAY=:10 ./scripts/test-extensions-unit.sh
-        name: Run Extension Unit Tests (Electron)
-        # {{SQL CARBON EDIT}} Add coveralls. We merge first to get around issue where parallel builds weren't being combined correctly
-      - run: node test/combineCoverage
-        name: Combine code coverage files
+      # {{SQL CARBON EDIT}} Skip caching for now
+      # - name: Compute node modules cache key
+      #   id: nodeModulesCacheKey
+      #   run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
+      # - name: Cache node modules
+      #   id: cacheNodeModules
+      #   uses: actions/cache@v2
+      #   with:
+      #     path: "**/node_modules"
+      #     key: ${{ runner.os }}-cacheNodeModules13-${{ steps.nodeModulesCacheKey.outputs.value }}
+      #     restore-keys: ${{ runner.os }}-cacheNodeModules13-
+      # - name: Get yarn cache directory path
+      #   id: yarnCacheDirPath
+      #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+      #   run: echo "::set-output name=dir::$(yarn cache dir)"
+      # - name: Cache yarn directory
+      #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+      #   uses: actions/cache@v2
+      #   with:
+      #     path: ${{ steps.yarnCacheDirPath.outputs.dir }}
+      #     key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+      #     restore-keys: ${{ runner.os }}-yarnCacheDir-
+      - name: Execute yarn
+        # if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }} {{SQL CARBON EDIT}} Skip caching for now
+        env:
+          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+        run: yarn --frozen-lockfile --network-timeout 180000
+
+      - name: Compile and Download
+        run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
+
+      - name: Run Unit Tests (Electron)
+        id: electron-unit-tests
+        run: DISPLAY=:10 ./scripts/test.sh --coverage --runGlob "**/sql/**/*.test.js" # {{SQL CARBON EDIT}} Run only our tests with coverage
+
+      - name: Run Extension Unit Tests (Electron)
+        id: electron-extension-unit-tests
+        run: DISPLAY=:10 ./scripts/test-extensions-unit.sh
+
+      # {{SQL CARBON EDIT}} Add coveralls. We merge first to get around issue where parallel builds weren't being combined correctly
+      - name: Combine code coverage files
+        run: node test/combineCoverage
      - name: Upload Code Coverage
        uses: coverallsapp/github-action@v1.1.1
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
          path-to-lcov: "test/coverage/lcov.info"

-    # Fails with cryptic error (e.g. https://github.com/microsoft/vscode/pull/90292/checks?check_run_id=433681926#step:13:9)
-    # - run: DISPLAY=:10 yarn test-browser --browser chromium
-    #   name: Run Unit Tests (Browser)
-    # - run: DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests" {{SQL CARBON EDIT}} remove step
-    #   name: Run Integration Tests (Electron)
+      # - name: Run Unit Tests (Browser) {{SQL CARBON EDIT}} Skip for now
+      #   id: browser-unit-tests
+      #   run: DISPLAY=:10 yarn test-browser --browser chromium

-  windows:
-    runs-on: windows-2016
-    env:
-      CHILD_CONCURRENCY: "1"
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - uses: actions/checkout@v2.2.0
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 12
-      - uses: actions/setup-python@v1
-        with:
-          python-version: "2.x"
-      # Increase timeout to get around latency issues when fetching certain packages
-      - run: |
-          yarn config set network-timeout 300000
-          yarn --frozen-lockfile
-        name: Install Dependencies
-      - run: yarn electron
-        name: Download Electron
-      - run: yarn gulp hygiene
-        name: Run Hygiene Checks
-      - run: yarn strict-vscode # {{SQL CARBON EDIT}} add step
-        name: Run Strict Compile Options
-      # - run: yarn monaco-compile-check {{SQL CARBON EDIT}} remove step
-      #   name: Run Monaco Editor Checks
-      - run: yarn valid-layers-check
-        name: Run Valid Layers Checks
-      - run: yarn compile
-        name: Compile Sources
-      # - run: yarn download-builtin-extensions {{SQL CARBON EDIT}} remove step
-      #   name: Download Built-in Extensions
-      - run: .\scripts\test.bat --tfs "Unit Tests"
-        name: Run Unit Tests (Electron)
-    # - run: yarn test-browser --browser chromium {{SQL CARBON EDIT}} disable for now @TODO @anthonydresser
-    #   name: Run Unit Tests (Browser)
-    # - run: .\scripts\test-integration.bat --tfs "Integration Tests" {{SQL CARBON EDIT}} remove step
-    #   name: Run Integration Tests (Electron)
+      # - name: Run Integration Tests (Electron) {{SQL CARBON EDIT}} Skip for now
+      #   id: electron-integration-tests
+      #   run: DISPLAY=:10 ./scripts/test-integration.sh

  darwin:
+    name: macOS
    runs-on: macos-latest
+    timeout-minutes: 30
    env:
-      CHILD_CONCURRENCY: "1"
      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
    steps:
      - uses: actions/checkout@v2.2.0
-      - uses: actions/setup-node@v1
+
+      - uses: actions/setup-node@v2
        with:
          node-version: 12
-      # Increase timeout to get around latency issues when fetching certain packages
-      - run: |
-          yarn config set network-timeout 300000
-          yarn --frozen-lockfile
-        name: Install Dependencies
-      - run: yarn electron x64
-        name: Download Electron
-      - run: yarn gulp hygiene
-        name: Run Hygiene Checks
-      - run: yarn strict-vscode # {{SQL CARBON EDIT}} add step
-        name: Run Strict Compile Options
-      # - run: yarn monaco-compile-check {{SQL CARBON EDIT}} remove step
-      #   name: Run Monaco Editor Checks
-      - run: yarn valid-layers-check
-        name: Run Valid Layers Checks
-      - run: yarn compile
-        name: Compile Sources
-      # - run: yarn download-builtin-extensions {{SQL CARBON EDIT}} remove step
-      #   name: Download Built-in Extensions
-      - run: ./scripts/test.sh --tfs "Unit Tests"
-        name: Run Unit Tests (Electron)
-  #   - run: yarn test-browser --browser chromium --browser webkit
-  #     name: Run Unit Tests (Browser)
-  #   - run: ./scripts/test-integration.sh --tfs "Integration Tests"
-  #     name: Run Integration Tests (Electron)

-  # monaco:
-  #   runs-on: ubuntu-latest
-  #   env:
-  #     CHILD_CONCURRENCY: "1"
-  #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #   steps:
-  #   - uses: actions/checkout@v2.2.0
-  #   # TODO: rename azure-pipelines/linux/xvfb.init to github-actions
-  #   - run: |
-  #       sudo apt-get update
-  #       sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libgbm1
-  #       sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb
-  #       sudo chmod +x /etc/init.d/xvfb
-  #       sudo update-rc.d xvfb defaults
-  #       sudo service xvfb start
-  #     name: Setup Build Environment
-  #   - uses: actions/setup-node@v1
-  #     with:
-  #       node-version: 10
-  #   - run: yarn --frozen-lockfile
-  #     name: Install Dependencies
-  #   - run: yarn monaco-compile-check
-  #     name: Run Monaco Editor Checks
-  #   - run: yarn gulp editor-esm-bundle
-  #     name: Editor Distro & ESM Bundle
+      # {{SQL CARBON EDIT}} Skip caching for now
+      # - name: Compute node modules cache key
+      #   id: nodeModulesCacheKey
+      #   run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
+      # - name: Cache node modules
+      #   id: cacheNodeModules
+      #   uses: actions/cache@v2
+      #   with:
+      #     path: "**/node_modules"
+      #     key: ${{ runner.os }}-cacheNodeModules13-${{ steps.nodeModulesCacheKey.outputs.value }}
+      #     restore-keys: ${{ runner.os }}-cacheNodeModules13-
+      # - name: Get yarn cache directory path
+      #   id: yarnCacheDirPath
+      #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+      #   run: echo "::set-output name=dir::$(yarn cache dir)"
+      # - name: Cache yarn directory
+      #   if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+      #   uses: actions/cache@v2
+      #   with:
+      #     path: ${{ steps.yarnCacheDirPath.outputs.dir }}
+      #     key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+      #     restore-keys: ${{ runner.os }}-yarnCacheDir-
+      - name: Execute yarn
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        env:
+          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+        run: yarn --frozen-lockfile --network-timeout 180000
+
+      - name: Compile and Download
+        run: yarn npm-run-all --max_old_space_size=4095 -lp compile "electron x64" playwright-install download-builtin-extensions
+
+      - name: Run Unit Tests (Electron)
+        run: DISPLAY=:10 ./scripts/test.sh
+
+      # - name: Run Unit Tests (Browser) {{SQL CARBON EDIT}} Skip for now
+      #   run: DISPLAY=:10 yarn test-browser --browser chromium
+
+      # - name: Run Integration Tests (Electron) {{SQL CARBON EDIT}} Skip for now
+      #   run: DISPLAY=:10 ./scripts/test-integration.sh
+
+  hygiene:
+    name: Hygiene and Layering
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 12
+
+      - name: Compute node modules cache key
+        id: nodeModulesCacheKey
+        run: echo "::set-output name=value::$(node build/azure-pipelines/common/computeNodeModulesCacheKey.js)"
+      - name: Cache node modules
+        id: cacheNodeModules
+        uses: actions/cache@v2
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.os }}-cacheNodeModules13-${{ steps.nodeModulesCacheKey.outputs.value }}
+          restore-keys: ${{ runner.os }}-cacheNodeModules13-
+      - name: Get yarn cache directory path
+        id: yarnCacheDirPath
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+      - name: Cache yarn directory
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.yarnCacheDirPath.outputs.dir }}
+          key: ${{ runner.os }}-yarnCacheDir-${{ steps.nodeModulesCacheKey.outputs.value }}
+          restore-keys: ${{ runner.os }}-yarnCacheDir-
+      - name: Setup Build Environment # {{SQL CARBON EDIT}} Add step to install required packages if we need to run yarn
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libkrb5-dev
+      - name: Execute yarn
+        if: ${{ steps.cacheNodeModules.outputs.cache-hit != 'true' }}
+        env:
+          PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+          ELECTRON_SKIP_BINARY_DOWNLOAD: 1
+        run: yarn --frozen-lockfile --network-timeout 180000
+
+      - name: Run Hygiene Checks
+        run: yarn gulp hygiene
+
+      - name: Run Valid Layers Checks
+        run: yarn valid-layers-check
+
+      - name: Run Strict Compile Options # {{SQL CARBON EDIT}} add step
+        run: yarn strict-vscode
+
+      # - name: Run Monaco Editor Checks {{SQL CARBON EDIT}} Remove Monaco checks
+      #   run: yarn monaco-compile-check
+
+      - name: Run Trusted Types Checks
+        run: yarn tsec-compile-check
+
+      # - name: Editor Distro & ESM Bundle {{SQL CARBON EDIT}} Remove Monaco checks
+      #   run: yarn gulp editor-esm-bundle
+
+      # - name: Typings validation prep {{SQL CARBON EDIT}} Remove Monaco checks
+      #   run: |
+      #     mkdir typings-test
+
+      # - name: Typings validation {{SQL CARBON EDIT}} Remove Monaco checks
+      #   working-directory: ./typings-test
+      #   run: |
+      #     yarn init -yp
+      #     ../node_modules/.bin/tsc --init
+      #     echo "import '../out-monaco-editor-core';" > a.ts
+      #     ../node_modules/.bin/tsc --noEmit
+
+      # - name: Webpack Editor {{SQL CARBON EDIT}} Remove Monaco checks
+      #   working-directory: ./test/monaco
+      #   run: yarn run bundle
+
+      # - name: Compile Editor Tests {{SQL CARBON EDIT}} Remove Monaco checks
+      #   working-directory: ./test/monaco
+      #   run: yarn run compile
+
+      # - name: Download Playwright {{SQL CARBON EDIT}} Remove Monaco checks
+      #   run: yarn playwright-install
+
+      # - name: Run Editor Tests {{SQL CARBON EDIT}} Remove Monaco checks
+      #   timeout-minutes: 5
+      #   working-directory: ./test/monaco
+      #   run: yarn test
--- a/.github/workflows/deep-classifier-runner.yml
+++ b/.github/workflows/deep-classifier-runner.yml
@@ -13,7 +13,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: "microsoft/vscode-github-triage-actions"
-          ref: v42
+          ref: stable
          path: ./actions
      - name: Install Actions
        run: npm install --production --prefix ./actions
@@ -38,7 +38,7 @@ jobs:
      - name: Install dependencies
        run: |
          python -m pip install --upgrade pip
-          pip install --upgrade numpy scipy scikit-learn joblib nltk simpletransformers torch torchvision
+          pip install --upgrade numpy==1.20.0 scipy==1.6.0 scikit-learn==0.24.1 joblib==1.0.0 nltk==3.5 simpletransformers==0.51.16 torch==1.7.1 torchvision==0.8.2
      - name: "Run Classifier: Generator"
        run: python ./actions/classifier-deep/apply/generate-labels/main.py
      - name: "Run Classifier: Labeler"
--- a/.github/workflows/deep-classifier-scraper.yml
+++ b/.github/workflows/deep-classifier-scraper.yml
@@ -1,5 +1,7 @@
 name: "Deep Classifier: Scraper"
 on:
+  schedule:
+    - cron: 0 0 15 * * # 15th of the month
  repository_dispatch:
    types: [trigger-deep-classifier-scraper]

@@ -11,7 +13,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: "microsoft/vscode-github-triage-actions"
-          ref: v42
+          ref: stable
          path: ./actions
      - name: Install Actions
        run: npm install --production --prefix ./actions
@@ -23,5 +25,5 @@ jobs:
        with:
          blobContainerName: vscode-issue-classifier
          blobStorageKey: ${{secrets.AZURE_BLOB_STORAGE_CONNECTION_STRING}}
-          token: ${{secrets.ISSUE_SCRAPER_TOKEN}}
+          token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
--- a/.github/workflows/devcontainer-cache.yml
+++ b/.github/workflows/devcontainer-cache.yml
@@ -2,9 +2,9 @@ name: VS Code Repo Dev Container Cache Image Generation

 on:
  push:
-    # Currently doing this for master, but could be done for PRs as well
+    # Currently doing this for main, but could be done for PRs as well
    branches:
-      - "master"
+      - "main"

    # Only updates to these files result in changes to installed packages, so skip otherwise
    paths:
@@ -22,7 +22,7 @@ jobs:

      - name: Azure CLI login
        id: az_login
-        uses: azure/login@v1
+        uses: azure/login@77f1b2e3fb80c0e8645114159d17008b8a2e475a
        with:
          creds: ${{ secrets.AZ_ACR_CREDS }}

@@ -35,6 +35,6 @@ jobs:
          az acr login --name $ACR_REGISTRY_NAME

          GIT_BRANCH=$(echo "${{ github.ref }}" | grep -oP 'refs/(heads|tags)/\K(.+)')
-          if [ "$GIT_BRANCH" == "" ]; then GIT_BRANCH=master; fi
+          if [ "$GIT_BRANCH" == "" ]; then GIT_BRANCH=main; fi

          .devcontainer/cache/build-cache-image.sh "${{ secrets.CONTAINER_IMAGE_REGISTRY }}/public/vscode/devcontainers/repos/microsoft/vscode" "${GIT_BRANCH}"
--- a/.github/workflows/latest-release-monitor.yml
+++ b/.github/workflows/latest-release-monitor.yml
@@ -14,7 +14,7 @@ jobs:
        with:
          repository: "microsoft/vscode-github-triage-actions"
          path: ./actions
-          ref: v42
+          ref: stable
      - name: Install Actions
        run: npm install --production --prefix ./actions
      - name: Install Storage Module