From 0c8c59764694b50b7c24bf84c4b6f9afe849fe50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Pallar=C3=A9s?= Date: Wed, 6 Nov 2024 11:34:58 +0100 Subject: [PATCH] wip --- .github/workflows/build.yml | 2 +- .github/workflows/matrix-update.yml | 2 +- .github/workflows/sdk-spec-test.yml | 5 +-- package.json | 4 +-- packages/vscode-wing/package.json | 3 +- pnpm-lock.yaml | 50 ++++++++++++++--------------- turbo.json | 1 - 7 files changed, 33 insertions(+), 34 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 524160ea670..aea8844c7ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ concurrency: env: NODE_VERSION: "20.11.1" - PNPM_VERSION: "8.15.1" + PNPM_VERSION: "8.15.9" CARGO_TERM_COLOR: always TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} TURBO_TEAM: ${{ vars.TURBO_TEAM }} diff --git a/.github/workflows/matrix-update.yml b/.github/workflows/matrix-update.yml index fd7bc646081..8602046603f 100644 --- a/.github/workflows/matrix-update.yml +++ b/.github/workflows/matrix-update.yml @@ -4,7 +4,7 @@ on: env: NODE_VERSION: "20.11.1" - PNPM_VERSION: "8.15.1" + PNPM_VERSION: "8.15.9" jobs: update: diff --git a/.github/workflows/sdk-spec-test.yml b/.github/workflows/sdk-spec-test.yml index 9789b0a8bf1..f04ec7a6580 100644 --- a/.github/workflows/sdk-spec-test.yml +++ b/.github/workflows/sdk-spec-test.yml @@ -43,7 +43,7 @@ env: REPO: ${{ inputs.repo || github.repository }} REF: ${{ inputs.ref || github.ref }} TARGET: ${{ inputs.target || (github.workflow == 'build' && 'all-stable') || (github.event_name == 'release' && 'all-unstable') || 'all' }} #the build runs only stable targets, realease only unstable - PNPM_VERSION: "8.15.1" + PNPM_VERSION: "8.15.9" AZURE_LOCATION: "East US" CDK_STACK_NAME: "sdk-spec-tests" GOOGLE_PROJECT_ID: "sdk-spec-tests" @@ -75,7 +75,8 @@ jobs: - name: Get list of directories and save them to the output id: setdirs shell: bash - run: | # TODO: skipping std, math and external folders, when https://github.com/winglang/wing/issues/3168 is resolve- we'll skip only the external folder. + run: + | # TODO: skipping std, math and external folders, when https://github.com/winglang/wing/issues/3168 is resolve- we'll skip only the external folder. dirs=$(ls -d tests/sdk_tests/*/ | sed 's/\/$//' | grep -v "external\|std\|math" | jq -R -s -c 'split("\n")[:-1]') processed_dirs=$(echo "{ \"directory\": $dirs }" | jq -c '[ .directory[] | {directory: ., name: (split("/") | last)}]') wrapped_dirs=$(echo $processed_dirs | jq -c .) diff --git a/package.json b/package.json index b9a1ee48678..29415523a32 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "@winglang/compatibility-spy": "workspace:^", "bump-pack": "workspace:^", "generate-workspace": "workspace:^", - "turbo": "^2.1.1" + "turbo": "^2.2.3" }, "scripts": { "build": "turbo compile post-compile lint eslint test package", @@ -21,7 +21,7 @@ }, "volta": { "node": "20.17.0", - "pnpm": "8.15.1" + "pnpm": "8.15.9" }, "packageManager": "pnpm@8.15.9+sha512.499434c9d8fdd1a2794ebf4552b3b25c0a633abcee5bb15e7b5de90f32f47b513aca98cd5cfd001c31f0db454bc3804edccd578501e4ca293a6816166bbd9f81", "pnpm": { diff --git a/packages/vscode-wing/package.json b/packages/vscode-wing/package.json index 804bbdb63a8..54671d0f417 100644 --- a/packages/vscode-wing/package.json +++ b/packages/vscode-wing/package.json @@ -208,6 +208,5 @@ "volta": { "extends": "../../package.json" }, - "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \"npx projen\".", - "packageManager": "pnpm@8.15.9+sha512.499434c9d8fdd1a2794ebf4552b3b25c0a633abcee5bb15e7b5de90f32f47b513aca98cd5cfd001c31f0db454bc3804edccd578501e4ca293a6816166bbd9f81" + "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \"npx projen\"." } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3bdb1046a90..8f0898f3557 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -36,8 +36,8 @@ importers: specifier: workspace:^ version: link:tools/generate-workspace turbo: - specifier: ^2.1.1 - version: 2.1.1 + specifier: ^2.2.3 + version: 2.2.3 docs: devDependencies: @@ -14299,7 +14299,7 @@ packages: dependencies: semver: 7.6.3 shelljs: 0.8.5 - typescript: 5.7.0-dev.20240917 + typescript: 5.8.0-dev.20241106 dev: true /dset@3.1.3: @@ -22430,64 +22430,64 @@ packages: resolution: {integrity: sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==} engines: {node: '>=0.6.11 <=0.7.0 || >=0.7.3'} - /turbo-darwin-64@2.1.1: - resolution: {integrity: sha512-aYNuJpZlCoi0Htd79fl/2DywpewGKijdXeOfg9KzNuPVKzSMYlAXuAlNGh0MKjiOcyqxQGL7Mq9LFhwA0VpDpQ==} + /turbo-darwin-64@2.2.3: + resolution: {integrity: sha512-Rcm10CuMKQGcdIBS3R/9PMeuYnv6beYIHqfZFeKWVYEWH69sauj4INs83zKMTUiZJ3/hWGZ4jet9AOwhsssLyg==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-darwin-arm64@2.1.1: - resolution: {integrity: sha512-tifJKD8yHY48rHXPMcM8o1jI/Jk2KCaXiNjTKvvy9Zsim61BZksNVLelIbrRoCGwAN6PUBZO2lGU5iL/TQJ5Pw==} + /turbo-darwin-arm64@2.2.3: + resolution: {integrity: sha512-+EIMHkuLFqUdJYsA3roj66t9+9IciCajgj+DVek+QezEdOJKcRxlvDOS2BUaeN8kEzVSsNiAGnoysFWYw4K0HA==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-linux-64@2.1.1: - resolution: {integrity: sha512-Js6d/bSQe9DuV9c7ITXYpsU/ADzFHABdz1UIHa7Oqjj9VOEbFeA9WpAn0c+mdJrVD+IXJFbbDZUjN7VYssmtcg==} + /turbo-linux-64@2.2.3: + resolution: {integrity: sha512-UBhJCYnqtaeOBQLmLo8BAisWbc9v9daL9G8upLR+XGj6vuN/Nz6qUAhverN4Pyej1g4Nt1BhROnj6GLOPYyqxQ==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm64@2.1.1: - resolution: {integrity: sha512-LidzTCq0yvQ+N8w8Qub9FmhQ/mmEIeoqFi7DSupekEV2EjvE9jw/zYc9Pk67X+g7dHVfgOnvVzmrjChdxpFePw==} + /turbo-linux-arm64@2.2.3: + resolution: {integrity: sha512-hJYT9dN06XCQ3jBka/EWvvAETnHRs3xuO/rb5bESmDfG+d9yQjeTMlhRXKrr4eyIMt6cLDt1LBfyi+6CQ+VAwQ==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-windows-64@2.1.1: - resolution: {integrity: sha512-GKc9ZywKwy4xLDhwXd6H07yzl0TB52HjXMrFLyHGhCVnf/w0oq4sLJv2sjbvuarPjsyx4xnCBJ3m3oyL2XmFtA==} + /turbo-windows-64@2.2.3: + resolution: {integrity: sha512-NPrjacrZypMBF31b4HE4ROg4P3nhMBPHKS5WTpMwf7wydZ8uvdEHpESVNMOtqhlp857zbnKYgP+yJF30H3N2dQ==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /turbo-windows-arm64@2.1.1: - resolution: {integrity: sha512-oFKkMj11KKUv3xSK9/fhAEQTxLUp1Ol1EOktwc32+SFtEU0uls7kosAz0b+qe8k3pJGEMFdDPdqoEjyJidbxtQ==} + /turbo-windows-arm64@2.2.3: + resolution: {integrity: sha512-fnNrYBCqn6zgKPKLHu4sOkihBI/+0oYFr075duRxqUZ+1aLWTAGfHZLgjVeLh3zR37CVzuerGIPWAEkNhkWEIw==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /turbo@2.1.1: - resolution: {integrity: sha512-u9gUDkmR9dFS8b5kAYqIETK4OnzsS4l2ragJ0+soSMHh6VEeNHjTfSjk1tKxCqLyziCrPogadxP680J+v6yGHw==} + /turbo@2.2.3: + resolution: {integrity: sha512-5lDvSqIxCYJ/BAd6rQGK/AzFRhBkbu4JHVMLmGh/hCb7U3CqSnr5Tjwfy9vc+/5wG2DJ6wttgAaA7MoCgvBKZQ==} hasBin: true optionalDependencies: - turbo-darwin-64: 2.1.1 - turbo-darwin-arm64: 2.1.1 - turbo-linux-64: 2.1.1 - turbo-linux-arm64: 2.1.1 - turbo-windows-64: 2.1.1 - turbo-windows-arm64: 2.1.1 + turbo-darwin-64: 2.2.3 + turbo-darwin-arm64: 2.2.3 + turbo-linux-64: 2.2.3 + turbo-linux-arm64: 2.2.3 + turbo-windows-64: 2.2.3 + turbo-windows-arm64: 2.2.3 dev: true /type-check@0.4.0: @@ -22621,8 +22621,8 @@ packages: engines: {node: '>=14.17'} hasBin: true - /typescript@5.7.0-dev.20240917: - resolution: {integrity: sha512-LoeyRa9RbB6lMasZvBmepDPrI6KNHURSleqbQ4BL4lxvXbCAQkMgmRzqyjA2DJE0ytuj5OEPFU5k/g3f9GaQKA==} + /typescript@5.8.0-dev.20241106: + resolution: {integrity: sha512-oFqIoJnR/s4hq5I2MBDdeJThRVyyhRV5eo2EmxllNkSe76ycucq2h4QgWnq0g4Opf4KQjpi1m/jhgMoiwDc8CQ==} engines: {node: '>=14.17'} hasBin: true dev: true diff --git a/turbo.json b/turbo.json index 70cce2dd3c9..402f4192da3 100644 --- a/turbo.json +++ b/turbo.json @@ -11,7 +11,6 @@ "tools/bump-pack/**", "!tools/bump-pack/node_modules/**" ], - "ui": "stream", "tasks": { "default": { "inputs": ["*.json", ".projenrc.ts"]