diff --git a/.github/workflows/vscode.yaml b/.github/workflows/vscode.yaml index ba8b4b6a36..39e0c72abb 100644 --- a/.github/workflows/vscode.yaml +++ b/.github/workflows/vscode.yaml @@ -2,7 +2,7 @@ name: VSCode on: workflow_call: env: - VSCODE_VERSION: 1.85.0 + VSCODE_VERSION: stable jobs: native: env: @@ -20,11 +20,14 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 18.x + - id: get-date + run: echo "date=$(/bin/date -u "+%Y%m%d")" >> $GITHUB_OUTPUT + shell: bash - uses: actions/cache/restore@v3 id: cache with: path: ./extensions/vscode/.vscode-test/vscode-* - key: ${{ matrix.runner }}-vscode-${{ env.VSCODE_VERSION }} + key: ${{ matrix.runner }}-vscode-${{ env.VSCODE_VERSION }}-${{ steps.get-date.outputs.date }} - run: just vscode install - run: just vscode lint - run: just vscode test @@ -32,7 +35,7 @@ jobs: if: steps.cache.outputs.cache-hit != 'true' with: path: ./extensions/vscode/.vscode-test/vscode-* - key: ${{ matrix.runner }}-vscode-${{ env.VSCODE_VERSION }} + key: ${{ matrix.runner }}-vscode-${{ env.VSCODE_VERSION }}-${{ steps.get-date.outputs.date }} docker: runs-on: ubuntu-latest steps: @@ -40,11 +43,14 @@ jobs: with: fetch-depth: 0 - uses: ./.github/actions/setup + - id: get-date + run: echo "date=$(/bin/date -u "+%Y%m%d")" >> $GITHUB_OUTPUT + shell: bash - uses: actions/cache/restore@v3 id: cache with: path: ./extensions/vscode/.vscode-test/vscode-* - key: docker-vscode-${{ env.VSCODE_VERSION }} + key: docker-vscode-${{ env.VSCODE_VERSION }}-${{ steps.get-date.outputs.date }} - run: just vscode install - run: just vscode lint - run: just vscode test @@ -52,4 +58,4 @@ jobs: if: steps.cache.outputs.cache-hit != 'true' with: path: ./extensions/vscode/.vscode-test/vscode-* - key: docker-vscode-${{ env.VSCODE_VERSION }} + key: docker-vscode-${{ env.VSCODE_VERSION }}-${{ steps.get-date.outputs.date }} diff --git a/extensions/vscode/package-lock.json b/extensions/vscode/package-lock.json index e14fe6397c..b5399da23f 100644 --- a/extensions/vscode/package-lock.json +++ b/extensions/vscode/package-lock.json @@ -22,7 +22,7 @@ "@types/wait-on": "^5.3.3", "@typescript-eslint/eslint-plugin": "^6.7.3", "@typescript-eslint/parser": "^6.7.3", - "@vscode/test-electron": "^2.3.4", + "@vscode/test-electron": "^2.3.8", "eslint": "^8.50.0", "glob": "^10.3.3", "mocha": "^10.2.0", @@ -506,9 +506,9 @@ "dev": true }, "node_modules/@vscode/test-electron": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.5.tgz", - "integrity": "sha512-lAW7nQ0HuPqJnGJrtCzEKZCICtRizeP6qNanyCrjmdCOAAWjX3ixiG8RVPwqsYPQBWLPgYuE12qQlwXsOR/2fQ==", + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.8.tgz", + "integrity": "sha512-b4aZZsBKtMGdDljAsOPObnAi7+VWIaYl3ylCz1jTs+oV6BZ4TNHcVNC3xUn0azPeszBmwSBDQYfFESIaUQnrOg==", "dev": true, "dependencies": { "http-proxy-agent": "^4.0.1", diff --git a/extensions/vscode/package.json b/extensions/vscode/package.json index c2a9d4c29b..b45bb03910 100644 --- a/extensions/vscode/package.json +++ b/extensions/vscode/package.json @@ -71,7 +71,7 @@ "@types/wait-on": "^5.3.3", "@typescript-eslint/eslint-plugin": "^6.7.3", "@typescript-eslint/parser": "^6.7.3", - "@vscode/test-electron": "^2.3.4", + "@vscode/test-electron": "^2.3.8", "eslint": "^8.50.0", "glob": "^10.3.3", "mocha": "^10.2.0",