From 6b509b2ca32b759949667e145b73abe296163ec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Collonval?= Date: Mon, 30 Jan 2023 10:12:42 +0100 Subject: [PATCH 1/3] Update actions on benchmark --- .github/workflows/run-benchmark.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/run-benchmark.yml b/.github/workflows/run-benchmark.yml index a54fadaa..f68a4750 100644 --- a/.github/workflows/run-benchmark.yml +++ b/.github/workflows/run-benchmark.yml @@ -92,35 +92,35 @@ jobs: steps: - name: Checkout benchmarks project - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: benchmarks - name: Install node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: - node-version: "14.x" + node-version: "18.x" - name: Install Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: 3.10 - uses: iterative/setup-cml@v1 - name: Cache pip on Linux - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~/.cache/pip - key: ${{ runner.os }}-pip-3.8-${{ hashFiles('**/requirements.txt', 'setup.cfg') }} + key: ${{ runner.os }}-pip-3.10-${{ hashFiles('**/requirements.txt', 'setup.cfg') }} restore-keys: | - ${{ runner.os }}-pip-3.8 + ${{ runner.os }}-pip-3.10 - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" - name: Cache yarn - uses: actions/cache@v1 + uses: actions/cache@v3 id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -139,7 +139,7 @@ jobs: - name: Checkout reference branch - schedule if: ${{ inputs.event == 'schedule' }} - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: ${{ env.CHALLENGER_REPOSITORY }} ref: ${{ env.CHALLENGER_REF }} @@ -303,7 +303,7 @@ jobs: - name: Publish the report if: ${{ inputs.event == 'schedule' }} - uses: actions/github-script@v5 + uses: actions/github-script@v6 with: script: | const fs = require('fs'); @@ -319,7 +319,7 @@ jobs: - name: Upload Benchmark Test assets if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: ${{ inputs.artifacts_name }} path: | From e676f8b7df5a517f87be656405bc37e4b03b741f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Collonval?= Date: Mon, 30 Jan 2023 10:16:19 +0100 Subject: [PATCH 2/3] Bump actions and base image --- .github/workflows/run-benchmark.yml | 4 ++-- .github/workflows/run-memory-leak.yml | 22 +++++++++++----------- .github/workflows/test.yml | 22 +++++++++++----------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/run-benchmark.yml b/.github/workflows/run-benchmark.yml index f68a4750..b8fcba5b 100644 --- a/.github/workflows/run-benchmark.yml +++ b/.github/workflows/run-benchmark.yml @@ -69,7 +69,7 @@ permissions: jobs: run-benchmark: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: # Which browser to use (one of 'chromium', 'firefox', 'webkit') @@ -131,7 +131,7 @@ jobs: # First run the benchmark on the reference - name: Checkout reference branch if: ${{ inputs.event == 'workflow_dispatch' }} - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: jupyterlab/jupyterlab ref: ${{ inputs.reference_branch }} diff --git a/.github/workflows/run-memory-leak.yml b/.github/workflows/run-memory-leak.yml index cd30934f..86ac6912 100644 --- a/.github/workflows/run-memory-leak.yml +++ b/.github/workflows/run-memory-leak.yml @@ -19,7 +19,7 @@ on: jobs: memory-leak-test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: # How many samples to compute @@ -27,33 +27,33 @@ jobs: steps: - name: Checkout benchmarks project - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: benchmarks - name: Install node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: - node-version: "14.x" + node-version: "18.x" - name: Install Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: 3.10 - name: Cache pip on Linux - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~/.cache/pip - key: ${{ runner.os }}-pip-3.8-${{ hashFiles('**/requirements.txt', 'setup.cfg') }} + key: ${{ runner.os }}-pip-3.10-${{ hashFiles('**/requirements.txt', 'setup.cfg') }} restore-keys: | - ${{ runner.os }}-pip-3.8 + ${{ runner.os }}-pip-3.10 - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" - name: Cache yarn - uses: actions/cache@v1 + uses: actions/cache@v3 id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -62,7 +62,7 @@ jobs: ${{ runner.os }}-yarn- - name: Checkout JupyterLab - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: ${{ inputs.repository }} ref: ${{ inputs.branch }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 50e4a98a..2c80bff7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ on: jobs: test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: # How many times to switch between each tabs @@ -16,33 +16,33 @@ jobs: steps: - name: Checkout benchmarks project - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: benchmarks - name: Install node - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: - node-version: "14.x" + node-version: "18.x" - name: Install Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: 3.10 - name: Cache pip on Linux uses: actions/cache@v1 with: path: ~/.cache/pip - key: ${{ runner.os }}-pip-3.8-${{ hashFiles('**/requirements.txt', 'setup.cfg') }} + key: ${{ runner.os }}-pip-3.10-${{ hashFiles('**/requirements.txt', 'setup.cfg') }} restore-keys: | - ${{ runner.os }}-pip-3.8 + ${{ runner.os }}-pip-3.10 - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" - name: Cache yarn - uses: actions/cache@v1 + uses: actions/cache@v3 id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -51,7 +51,7 @@ jobs: ${{ runner.os }}-yarn- - name: Checkout JupyterLab - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: jupyterlab/jupyterlab ref: master @@ -114,7 +114,7 @@ jobs: - name: Upload Test assets if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: test-assets path: | From 9778e5d164e496ff1ddbf1243319c426ee05b6d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Collonval?= Date: Mon, 30 Jan 2023 10:38:05 +0100 Subject: [PATCH 3/3] Fix Python version --- .github/workflows/run-benchmark.yml | 2 +- .github/workflows/run-memory-leak.yml | 2 +- .github/workflows/test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-benchmark.yml b/.github/workflows/run-benchmark.yml index b8fcba5b..736bb63e 100644 --- a/.github/workflows/run-benchmark.yml +++ b/.github/workflows/run-benchmark.yml @@ -104,7 +104,7 @@ jobs: - name: Install Python uses: actions/setup-python@v4 with: - python-version: 3.10 + python-version: "3.10" - uses: iterative/setup-cml@v1 diff --git a/.github/workflows/run-memory-leak.yml b/.github/workflows/run-memory-leak.yml index 86ac6912..b83076f5 100644 --- a/.github/workflows/run-memory-leak.yml +++ b/.github/workflows/run-memory-leak.yml @@ -39,7 +39,7 @@ jobs: - name: Install Python uses: actions/setup-python@v4 with: - python-version: 3.10 + python-version: "3.10" - name: Cache pip on Linux uses: actions/cache@v3 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2c80bff7..56e02ee8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,7 +28,7 @@ jobs: - name: Install Python uses: actions/setup-python@v4 with: - python-version: 3.10 + python-version: "3.10" - name: Cache pip on Linux uses: actions/cache@v1