diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6dd06c5f7e8d..2229df086084 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -24,10 +24,10 @@ jobs: - name: Checkout repo uses: actions/checkout@v2 - - name: Install Node.js v12 + - name: Install Node.js v14 uses: actions/setup-node@v2 with: - node-version: "12" + node-version: "14" - name: Install helm uses: azure/setup-helm@v1.1 @@ -67,10 +67,10 @@ jobs: - name: Checkout repo uses: actions/checkout@v2 - - name: Install Node.js v12 + - name: Install Node.js v14 uses: actions/setup-node@v2 with: - node-version: "12" + node-version: "14" - name: Fetch dependencies from cache id: cache-yarn @@ -96,10 +96,10 @@ jobs: with: fetch-depth: 0 - - name: Install Node.js v12 + - name: Install Node.js v14 uses: actions/setup-node@v2 with: - node-version: "12" + node-version: "14" - name: Fetch dependencies from cache id: cache-yarn @@ -169,10 +169,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Install Node.js v12 + - name: Install Node.js v14 uses: actions/setup-node@v2 with: - node-version: "12" + node-version: "14" - name: Install development tools run: | @@ -244,10 +244,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Install Node.js v12 + - name: Install Node.js v14 uses: actions/setup-node@v2 with: - node-version: "12" + node-version: "14" - name: Install nfpm run: | @@ -270,8 +270,8 @@ jobs: - name: Replace node with arm64 equivalent run: | - wget https://nodejs.org/dist/v12.18.4/node-v12.18.4-linux-arm64.tar.gz - tar -xzf node-v12.18.4-linux-arm64.tar.gz node-v12.18.4-linux-arm64/bin/node --strip-components=2 + wget https://nodejs.org/dist/v14.17.0/node-v14.17.0-linux-arm64.tar.xz + tar -xf node-v14.17.0-linux-arm64.tar.xz node-v14.17.0-linux-arm64/bin/node --strip-components=2 mv ./node ./release-standalone/lib/node - name: Build packages with nfpm @@ -290,10 +290,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Install Node.js v12 + - name: Install Node.js v14 uses: actions/setup-node@v2 with: - node-version: "12" + node-version: "14" - name: Install nfpm run: | @@ -333,10 +333,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Install Node.js v12 + - name: Install Node.js v14 uses: actions/setup-node@v2 with: - node-version: "12" + node-version: "14" - name: Install playwright uses: microsoft/playwright-github-action@v1 @@ -386,9 +386,10 @@ jobs: - name: Remove release packages and test artifacts run: rm -rf ./release-packages ./test/test-results - docker-amd64: + # Builds both amd64 and arm64 images + docker-images: runs-on: ubuntu-latest - needs: package-linux-amd64 + needs: [package-linux-amd64, package-linux-arm64] steps: - uses: actions/checkout@v2 @@ -398,34 +399,16 @@ jobs: name: release-packages path: ./release-packages - - name: Run ./ci/steps/build-docker-image.sh - run: ./ci/steps/build-docker-image.sh + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 - - name: Upload release image - uses: actions/upload-artifact@v2 - with: - name: release-images - path: ./release-images - - # TODO: this is the last place where we use our self-hosted arm64 runner. - # In the future, consider switching to docker buildx + qemu, - # thus removing the requirement for us to maintain the runner. - docker-arm64: - runs-on: ubuntu-arm64-latest - needs: package-linux-arm64 - steps: - - uses: actions/checkout@v2 - - - name: Download release package - uses: actions/download-artifact@v2 - with: - name: release-packages - path: ./release-packages + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 - name: Run ./ci/steps/build-docker-image.sh run: ./ci/steps/build-docker-image.sh - - name: Upload release image + - name: Upload release images uses: actions/upload-artifact@v2 with: name: release-images @@ -433,7 +416,7 @@ jobs: trivy-scan-image: runs-on: ubuntu-20.04 - needs: docker-amd64 + needs: docker-images # NOTE@jsjoeio: disabling due to a memory issue upstream # See: https://github.com/github/codeql-action/issues/528 if: 1 == 2 @@ -449,7 +432,7 @@ jobs: - name: Run Trivy vulnerability scanner in image mode # Commit SHA for v0.0.17 - uses: aquasecurity/trivy-action@dba83feec810c70bacbc4bead308ae1e466c572b + uses: aquasecurity/trivy-action@ac8de07fd168680dd0331bef43681c0e150e9ad1 with: input: "./release-images/code-server-amd64-*.tar" scan-type: "image" @@ -466,6 +449,7 @@ jobs: uses: github/codeql-action/upload-sarif@v1 with: sarif_file: "trivy-image-results.sarif" + # We have to use two trivy jobs # because GitHub only allows # codeql/upload-sarif action per job @@ -476,7 +460,7 @@ jobs: uses: actions/checkout@v2 - name: Run Trivy vulnerability scanner in repo mode #Commit SHA for v0.0.17 - uses: aquasecurity/trivy-action@dba83feec810c70bacbc4bead308ae1e466c572b + uses: aquasecurity/trivy-action@ac8de07fd168680dd0331bef43681c0e150e9ad1 with: scan-type: "fs" scan-ref: "." diff --git a/.tours/start-development.tour b/.tours/start-development.tour index 4df15077d36f..03f32927ebbc 100644 --- a/.tours/start-development.tour +++ b/.tours/start-development.tour @@ -5,7 +5,7 @@ { "file": "package.json", "line": 31, - "description": "## Commands\n\nTo start developing, make sure you have Node 12+ and the [required dependencies](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites) installed. Then, run the following commands:\n\n1. Install dependencies:\n>> yarn\n\n3. Start development mode (and watch for changes):\n>> yarn watch" + "description": "## Commands\n\nTo start developing, make sure you have Node 14+ and the [required dependencies](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites) installed. Then, run the following commands:\n\n1. Install dependencies:\n>> yarn\n\n3. Start development mode (and watch for changes):\n>> yarn watch" }, { "file": "src/node/app.ts", diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f7a0e43ff4f..50f593d1c0cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,31 +1,3 @@ - - -# Changelog - -- [Changelog](#changelog) - - [Next Version](#next-version) - - [New Features](#new-features) - - [Bug Fixes](#bug-fixes) - - [Documentation](#documentation) - - [Development](#development) - - [3.10.2](#3102) - - [New Features](#new-features-1) - - [Bug Fixes](#bug-fixes-1) - - [Development](#development-1) - - [Documentation](#documentation-1) - - [3.10.1](#3101) - - [Bug Fixes](#bug-fixes-2) - - [Documentation](#documentation-2) - - [Development](#development-2) - - [3.10.0](#3100) - - [New Features](#new-features-2) - - [Bug Fixes](#bug-fixes-3) - - [Documentation](#documentation-3) - - [Development](#development-3) - - [Previous versions](#previous-versions) - - - # Changelog