diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63f597b288f..13cd212ee34 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,6 @@ concurrency: cancel-in-progress: true env: - NODEJS_VERSION: "18.x" # Testing runs out of memory without this NODE_OPTIONS: "--max-old-space-size=4096" PROJEN_BUMP_VERSION: "0.0.0-dev.${{ github.run_id }}.${{ github.run_attempt }}" @@ -100,10 +99,9 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Setup Node - uses: actions/setup-node@v3 - with: - node-version: ${{ env.NODEJS_VERSION }} + # Reads versions from root package.json "volta" section + - name: Setup Node/NPM with pinned Volta version + uses: volta-cli/action@v4.0.0 - name: Install Rust uses: actions-rs/toolchain@v1 @@ -121,21 +119,14 @@ jobs: - name: Lint Nx run: npx nx workspace-lint - - name: Build and Unit Test + - name: Build, Test, and Package uses: MansaGroup/nrwl-nx-action@v2 with: - targets: "build" + targets: "build,test,package" all: true # Exclude E2E testing args: "--exclude=hangar --configuration=release --output-style=stream --verbose" - - name: Create NPM packages - uses: MansaGroup/nrwl-nx-action@v2 - with: - targets: "package" - projects: "winglang,sdk" - args: "--configuration=release --output-style=stream --verbose" - - name: Upload Wing CLI uses: actions/upload-artifact@v2 with: @@ -230,11 +221,6 @@ jobs: - name: Download Build Artifacts uses: actions/download-artifact@v2 - - name: Setup Node - uses: actions/setup-node@v3 - with: - node-version: ${{ env.NODEJS_VERSION }} - - name: Tag commit uses: tvdias/github-tagger@v0.0.1 if: ${{ needs.prepare.outputs.last-version != needs.prepare.outputs.version }} diff --git a/apps/jsii-docgen/project.json b/apps/jsii-docgen/project.json index 77ee7a947ca..24cc7d8c6db 100644 --- a/apps/jsii-docgen/project.json +++ b/apps/jsii-docgen/project.json @@ -6,7 +6,7 @@ "executor": "nx:run-script", "options": { "cwd": "apps/jsii-docgen", - "script": "build" + "script": "compile" } } } diff --git a/apps/wing-api-checker/project.json b/apps/wing-api-checker/project.json index d3dd68fb5e5..8bc7d728a8f 100644 --- a/apps/wing-api-checker/project.json +++ b/apps/wing-api-checker/project.json @@ -6,7 +6,7 @@ "executor": "nx:run-script", "options": { "cwd": "apps/wing-api-checker", - "script": "build" + "script": "compile" } } } diff --git a/apps/wing-playground/package-lock.json b/apps/wing-playground/package-lock.json index 81439507816..5408ed5abc7 100644 --- a/apps/wing-playground/package-lock.json +++ b/apps/wing-playground/package-lock.json @@ -19,6 +19,7 @@ } }, "../../libs/wingsdk": { + "name": "@winglang/sdk", "version": "0.0.0", "bundleDependencies": [ "@aws-sdk/client-cloudwatch-logs", diff --git a/package.json b/package.json index 0d54690f745..af2172f7b58 100644 --- a/package.json +++ b/package.json @@ -16,15 +16,15 @@ "contributors:check": "all-contributors check", "contributors:generate": "all-contributors generate", "docs": "./scripts/docsite.sh", - "install:hangar": "npm --prefix tools/hangar install", - "install:jsii-docgen": "npm --prefix apps/jsii-docgen install", - "install:sdk": "npm --prefix libs/wingsdk install", - "install:tree-sitter-wing": "npm --prefix libs/tree-sitter-wing install", - "install:vscode-wing": "npm --prefix apps/vscode-wing install", + "install:hangar": "npm --prefix tools/hangar --install-links=false install", + "install:jsii-docgen": "npm --prefix apps/jsii-docgen --install-links=false install", + "install:sdk": "npm --prefix libs/wingsdk --install-links=false install", + "install:tree-sitter-wing": "npm --prefix libs/tree-sitter-wing --install-links=false install", + "install:vscode-wing": "npm --prefix apps/vscode-wing --install-links=false install", "install:wasi": "bash scripts/setup_wasi.sh", - "install:wing-api-checker": "npm --prefix apps/wing-api-checker install", - "install:wing-playground": "npm --prefix apps/wing-playground install", - "install:winglang": "npm --prefix apps/wing install", + "install:wing-api-checker": "npm --prefix apps/wing-api-checker --install-links=false install", + "install:wing-playground": "npm --prefix apps/wing-playground --install-links=false install", + "install:winglang": "npm --prefix apps/wing --install-links=false install", "nx": "nx", "postinstall": "run-p -l --max-parallel 3 'install:*'", "test": "nx run-many --target=test --all=true"