Skip to content

Commit

Permalink
Merge branch 'master' into arekkubaczkowski/fix-storybook-relative-st…
Browse files Browse the repository at this point in the history
…ory-paths
  • Loading branch information
xiongemi authored Mar 28, 2024
2 parents 56453c1 + b051bbf commit adc37ac
Show file tree
Hide file tree
Showing 200 changed files with 3,465 additions and 2,674 deletions.
118 changes: 60 additions & 58 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- cron: "0 3 * * 2-6" # Tuesdays - Saturdays, at 3am UTC
workflow_dispatch:
release:
types: [published]
types: [ published ]

env:
DEBUG: napi:*
Expand Down Expand Up @@ -158,62 +158,64 @@ jobs:
if-no-files-found: error

build-freebsd:
if: ${{ github.repository_owner == 'nrwl' }}
runs-on: macos-13-large
name: Build FreeBSD
timeout-minutes: 45
steps:
- uses: actions/checkout@v4
if: ${{ github.event_name != 'schedule' }}
- name: Build
id: build
if: ${{ github.event_name != 'schedule' }}
uses: cross-platform-actions/[email protected]
env:
DEBUG: napi:*
RUSTUP_IO_THREADS: 1
with:
operating_system: freebsd
version: '13.2'
architecture: x86-64
environment_variables: DEBUG RUSTUP_IO_THREADS CI
shell: bash
run: |
env
whoami
sudo pkg install -y -f node libnghttp2 npm git
sudo npm install --location=global --ignore-scripts pnpm
curl https://sh.rustup.rs -sSf --output rustup.sh
sh rustup.sh -y --profile minimal --default-toolchain stable
source "$HOME/.cargo/env"
echo "~~~~ rustc --version ~~~~"
rustc --version
echo "~~~~ node -v ~~~~"
node -v
echo "~~~~ pnpm --version ~~~~"
pnpm --version
pwd
ls -lah
whoami
env
freebsd-version
mkdir -p /Users/runner/work/_temp/_github_workflow
echo "{}" > /Users/runner/work/_temp/_github_workflow/event.json
pnpm install --frozen-lockfile --ignore-scripts
pnpm nx run-many --outputStyle stream --target=build-native -- --target=x86_64-unknown-freebsd
pnpm nx reset
rm -rf node_modules
rm -rf dist
echo "KILL ALL NODE PROCESSES"
killall node || true
echo "COMPLETE"
- name: Upload artifact
if: ${{ github.event_name != 'schedule' }}
uses: actions/upload-artifact@v3
with:
name: bindings-freebsd
path: packages/**/*.node
if-no-files-found: error
if: ${{ github.repository_owner == 'nrwl' }}
runs-on: macos-13-large
name: Build FreeBSD
timeout-minutes: 45
steps:
- uses: actions/checkout@v4
if: ${{ github.event_name != 'schedule' }}
- name: Build
id: build
if: ${{ github.event_name != 'schedule' }}
uses: cross-platform-actions/[email protected]
env:
DEBUG: napi:*
RUSTUP_IO_THREADS: 1
NX_PREFER_TS_NODE: true
PLAYWRIGHT_BROWSERS_PATH: 0
with:
operating_system: freebsd
version: '13.2'
architecture: x86-64
environment_variables: DEBUG RUSTUP_IO_THREADS CI NX_PREFER_TS_NODE PLAYWRIGHT_BROWSERS_PATH
shell: bash
run: |
env
whoami
sudo pkg install -y -f node libnghttp2 npm git
sudo npm install --location=global --ignore-scripts pnpm
curl https://sh.rustup.rs -sSf --output rustup.sh
sh rustup.sh -y --profile minimal --default-toolchain stable
source "$HOME/.cargo/env"
echo "~~~~ rustc --version ~~~~"
rustc --version
echo "~~~~ node -v ~~~~"
node -v
echo "~~~~ pnpm --version ~~~~"
pnpm --version
pwd
ls -lah
whoami
env
freebsd-version
mkdir -p /Users/runner/work/_temp/_github_workflow
echo "{}" > /Users/runner/work/_temp/_github_workflow/event.json
pnpm install --frozen-lockfile --ignore-scripts
pnpm nx run-many --outputStyle stream --target=build-native -- --target=x86_64-unknown-freebsd
pnpm nx reset
rm -rf node_modules
rm -rf dist
echo "KILL ALL NODE PROCESSES"
killall node || true
echo "COMPLETE"
- name: Upload artifact
if: ${{ github.event_name != 'schedule' }}
uses: actions/upload-artifact@v3
with:
name: bindings-freebsd
path: packages/**/*.node
if-no-files-found: error

publish:
if: ${{ github.repository_owner == 'nrwl' }}
Expand Down Expand Up @@ -275,7 +277,7 @@ jobs:
run: |
# The GITHUB_REF_NAME is a full version (i.e. 17.3.2). The branchName will only use the major version number.
# We will publish docs to the website branch based on the current tag (i.e. website-17)
branchName=website-${$GITHUB_REF_NAME%.*.*}
branchName=website-${GITHUB_REF_NAME%.*.*}
# We force recreate the branch in order to always be up to date and avoid merge conflicts within the automated workflow
git branch -f $branchName
git push -f origin $branchName
4 changes: 2 additions & 2 deletions .nx/workflows/agents.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
launch-templates:
linux-medium:
resource-class: 'docker_linux_amd64/medium+'
image: 'ubuntu22.04-node20.9-v3'
image: 'ubuntu22.04-node20.11-v3'
env:
GIT_AUTHOR_EMAIL: [email protected]
GIT_AUTHOR_NAME: Test
Expand Down Expand Up @@ -30,7 +30,7 @@ launch-templates:
sudo apt-get install -y ca-certificates lsof
- name: Install Pnpm
script: |
npm install -g @pnpm/exe@8.7.4
npm install -g pnpm@8.15.5
- name: Pnpm Install
script: |
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(The MIT License)

Copyright (c) 2017-2023 Narwhal Technologies Inc.
Copyright (c) 2017-2024 Narwhal Technologies Inc.

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
2 changes: 1 addition & 1 deletion docs/changelog/18_0_0.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ title="Nx 18.0!!!"
{% card title="Project Details View" type="document" url="/features/explore-graph#explore-projects-in-your-workspace" /%}
{% card title="New @nx/nuxt plugin" type="document" url="/nx-api/nuxt" /%}
{% card title="Distribute tasks on Nx Agents" type="document" url="/ci/features/distribute-task-execution" /%}
{% card title="Automatically split e2e tasks (Test Atomizer)" type="document" url="/ci/features/split-e2e-tasks" /%}
{% card title="Automatically split e2e tasks (Atomizer)" type="document" url="/ci/features/split-e2e-tasks" /%}
{% card title="Re-run flaky tasks" type="document" url="/ci/features/flaky-tasks" /%}
{% /cards %}

Expand Down
12 changes: 12 additions & 0 deletions docs/generated/cli/show.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,12 @@ Type: `boolean`

Untracked changes

##### verbose

Type: `boolean`

Prints additional information about the commands (e.g., stack traces)

##### version

Type: `boolean`
Expand Down Expand Up @@ -199,6 +205,12 @@ Type: `string`

Which project should be viewed?

##### verbose

Type: `boolean`

Prints additional information about the commands (e.g., stack traces)

##### version

Type: `boolean`
Expand Down
2 changes: 1 addition & 1 deletion docs/generated/devkit/PluginConfiguration.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Type alias: PluginConfiguration

Ƭ **PluginConfiguration**: `string` \| \{ `options?`: `unknown` ; `plugin`: `string` }
Ƭ **PluginConfiguration**: `string` \| \{ `exclude?`: `string`[] ; `include?`: `string`[] ; `options?`: `unknown` ; `plugin`: `string` }
75 changes: 65 additions & 10 deletions docs/generated/manifests/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@
"path": "/ci/intro/ci-with-nx",
"tags": []
},
{
"id": "why-nx-cloud",
"name": "Why Nx Cloud?",
"description": "",
"mediaImage": "",
"file": "nx-cloud/intro/why-nx-cloud",
"itemList": [],
"isExternal": false,
"path": "/ci/intro/why-nx-cloud",
"tags": []
},
{
"id": "tutorials",
"name": "Tutorials",
Expand Down Expand Up @@ -67,6 +78,17 @@
"path": "/ci/intro/ci-with-nx",
"tags": []
},
"/ci/intro/why-nx-cloud": {
"id": "why-nx-cloud",
"name": "Why Nx Cloud?",
"description": "",
"mediaImage": "",
"file": "nx-cloud/intro/why-nx-cloud",
"itemList": [],
"isExternal": false,
"path": "/ci/intro/why-nx-cloud",
"tags": []
},
"/ci/intro/tutorials": {
"id": "tutorials",
"name": "Tutorials",
Expand Down Expand Up @@ -133,7 +155,7 @@
{
"id": "affected",
"name": "Run Only Tasks Affected by a PR",
"description": "",
"description": "This allows to only run tasks on projects that got changed in a given PR.",
"mediaImage": "",
"file": "shared/using-nx/affected",
"itemList": [],
Expand Down Expand Up @@ -166,7 +188,7 @@
{
"id": "dynamic-agents",
"name": "Dynamically Allocate Agents",
"description": "",
"description": "Learn how to dynamically allocate agents based on the size of a PR, keeping the balance of speed and cost.",
"mediaImage": "",
"file": "nx-cloud/features/dynamic-agents",
"itemList": [],
Expand All @@ -176,8 +198,8 @@
},
{
"id": "split-e2e-tasks",
"name": "Automatically Split E2E Tasks (TestAtomizer)",
"description": "",
"name": "Automatically Split E2E Tasks (Atomizer)",
"description": "Learn how Nx can automatically split e2e tests into fine-grained chunks for a much better distribution on Nx Agents.",
"mediaImage": "",
"file": "nx-cloud/features/split-e2e-tasks",
"itemList": [],
Expand All @@ -188,7 +210,7 @@
{
"id": "flaky-tasks",
"name": "Identify and Re-run Flaky Tasks",
"description": "",
"description": "Learn how Nx Cloud is able to automatically identify flaky tasks and re-run them for you.",
"mediaImage": "",
"file": "nx-cloud/features/flaky-tasks",
"itemList": [],
Expand All @@ -215,7 +237,7 @@
"/ci/features/affected": {
"id": "affected",
"name": "Run Only Tasks Affected by a PR",
"description": "",
"description": "This allows to only run tasks on projects that got changed in a given PR.",
"mediaImage": "",
"file": "shared/using-nx/affected",
"itemList": [],
Expand Down Expand Up @@ -248,7 +270,7 @@
"/ci/features/dynamic-agents": {
"id": "dynamic-agents",
"name": "Dynamically Allocate Agents",
"description": "",
"description": "Learn how to dynamically allocate agents based on the size of a PR, keeping the balance of speed and cost.",
"mediaImage": "",
"file": "nx-cloud/features/dynamic-agents",
"itemList": [],
Expand All @@ -258,8 +280,8 @@
},
"/ci/features/split-e2e-tasks": {
"id": "split-e2e-tasks",
"name": "Automatically Split E2E Tasks (TestAtomizer)",
"description": "",
"name": "Automatically Split E2E Tasks (Atomizer)",
"description": "Learn how Nx can automatically split e2e tests into fine-grained chunks for a much better distribution on Nx Agents.",
"mediaImage": "",
"file": "nx-cloud/features/split-e2e-tasks",
"itemList": [],
Expand All @@ -270,7 +292,7 @@
"/ci/features/flaky-tasks": {
"id": "flaky-tasks",
"name": "Identify and Re-run Flaky Tasks",
"description": "",
"description": "Learn how Nx Cloud is able to automatically identify flaky tasks and re-run them for you.",
"mediaImage": "",
"file": "nx-cloud/features/flaky-tasks",
"itemList": [],
Expand Down Expand Up @@ -569,6 +591,17 @@
"isExternal": false,
"path": "/ci/recipes/source-control-integration/gitlab",
"tags": []
},
{
"id": "azure-devops",
"name": "Enable Azure DevOps PR Integration",
"description": "",
"mediaImage": "",
"file": "nx-cloud/set-up/azure-devops",
"itemList": [],
"isExternal": false,
"path": "/ci/recipes/source-control-integration/azure-devops",
"tags": []
}
],
"isExternal": false,
Expand Down Expand Up @@ -1110,6 +1143,17 @@
"isExternal": false,
"path": "/ci/recipes/source-control-integration/gitlab",
"tags": []
},
{
"id": "azure-devops",
"name": "Enable Azure DevOps PR Integration",
"description": "",
"mediaImage": "",
"file": "nx-cloud/set-up/azure-devops",
"itemList": [],
"isExternal": false,
"path": "/ci/recipes/source-control-integration/azure-devops",
"tags": []
}
],
"isExternal": false,
Expand Down Expand Up @@ -1149,6 +1193,17 @@
"path": "/ci/recipes/source-control-integration/gitlab",
"tags": []
},
"/ci/recipes/source-control-integration/azure-devops": {
"id": "azure-devops",
"name": "Enable Azure DevOps PR Integration",
"description": "",
"mediaImage": "",
"file": "nx-cloud/set-up/azure-devops",
"itemList": [],
"isExternal": false,
"path": "/ci/recipes/source-control-integration/azure-devops",
"tags": []
},
"/ci/recipes/enterprise": {
"id": "enterprise",
"name": "Enterprise",
Expand Down
Loading

0 comments on commit adc37ac

Please sign in to comment.