Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit64ae261

Browse files
authored
Merge branch 'main' into feature/dot-instead-of-plus
2 parentsc63f678 +08d1d0d commit64ae261

File tree

21 files changed

+1169
-1838
lines changed

21 files changed

+1169
-1838
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -68,34 +68,34 @@ jobs:
6868
git config --global user.email test@example.com
6969
git config --global user.name "Tester McPerson"
7070
71-
-name:Generate and configure GPG for signing commits and tags in E2E tests
72-
run:|
73-
# Generate a GPG key for test@example.com and store the output from stderr
74-
GPG_OUTPUT=$(echo "Key-Type: default
75-
Key-Length: 2048
76-
Subkey-Type: default
77-
Subkey-Length: 2048
78-
Name-Real: Tester McPerson
79-
Name-Email: test@example.com
80-
Expire-Date: 0
81-
%no-protection" | gpg --pinentry-mode loopback --batch --generate-key 2>&1)
82-
83-
# Find and extract the revocation file path from sdterr
84-
REVOCATION_FILE=$(echo "$GPG_OUTPUT" | grep '.rev' | tr '\n' ' ' | awk -F "'" '{print $4}')
85-
86-
# Get the GPG key ID and the full fingerprint
87-
export GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep sec | awk '{print $2}' | cut -d'/' -f2)
88-
export GPG_FULL_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep "$GPG_KEY_ID" | grep -v "sec" | awk '{print $1}' | cut -d'/' -f2)
89-
90-
# Export fingerprint and the path to the revocation file to GITHUB_ENV
91-
# This allows the last step in this job to revoke and delete the key
92-
echo "GPG_FULL_KEY_ID=$GPG_FULL_KEY_ID" >> $GITHUB_ENV
93-
echo "REVOCATION_FILE=$REVOCATION_FILE" >> $GITHUB_ENV
94-
95-
# Setup git signing for commits and tags
96-
git config commit.gpgsigntrue
97-
git config tag.gpgsigntrue
98-
git config --global user.signingkey $GPG_KEY_ID
71+
#- name: Generate and configure GPG for signing commits and tags in E2E tests
72+
# run: |
73+
# # Generate a GPG key for test@example.com and store the output from stderr
74+
# GPG_OUTPUT=$(echo "Key-Type: default
75+
# Key-Length: 2048
76+
# Subkey-Type: default
77+
# Subkey-Length: 2048
78+
# Name-Real: Tester McPerson
79+
# Name-Email: test@example.com
80+
# Expire-Date: 0
81+
# %no-protection" | gpg --pinentry-mode loopback --batch --generate-key 2>&1)
82+
83+
# # Find and extract the revocation file path from sdterr
84+
# REVOCATION_FILE=$(echo "$GPG_OUTPUT" | grep '.rev' | tr '\n' ' ' | awk -F "'" '{print $4}')
85+
86+
# # Get the GPG key ID and the full fingerprint
87+
# export GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep sec | awk '{print $2}' | cut -d'/' -f2)
88+
# export GPG_FULL_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep "$GPG_KEY_ID" | grep -v "sec" | awk '{print $1}' | cut -d'/' -f2)
89+
90+
# # Export fingerprint and the path to the revocation file to GITHUB_ENV
91+
# # This allows the last step in this job to revoke and delete the key
92+
# echo "GPG_FULL_KEY_ID=$GPG_FULL_KEY_ID" >> $GITHUB_ENV
93+
# echo "REVOCATION_FILE=$REVOCATION_FILE" >> $GITHUB_ENV
94+
95+
# # Setup git signing for commits and tags
96+
# git config commit.gpgsign true
97+
# git config tag.gpgsign true
98+
# git config --global user.signingkey $GPG_KEY_ID
9999

100100
-name:Install primary node version (see volta config in package.json) and dependencies
101101
uses:./.github/actions/install-node-and-dependencies
@@ -105,16 +105,16 @@ jobs:
105105
env:
106106
NX_AGENT_NAME:${{ matrix.agent }}
107107

108-
-name:Revoke and delete GPG key
109-
# It's important that we always run this step, otherwise the key will remain active if any of the steps above fail
110-
if:${{ always() }}
111-
run:|
112-
# As instructed in the text of revocation file, there is a colon that needs to be removed manually
113-
sed -i "s/:-----BEGIN PGP PUBLIC KEY BLOCK-----/-----BEGIN PGP PUBLIC KEY BLOCK-----/" $REVOCATION_FILE
108+
#- name: Revoke and delete GPG key
109+
# # It's important that we always run this step, otherwise the key will remain active if any of the steps above fail
110+
# if: ${{ always() }}
111+
# run: |
112+
# # As instructed in the text of revocation file, there is a colon that needs to be removed manually
113+
# sed -i "s/:-----BEGIN PGP PUBLIC KEY BLOCK-----/-----BEGIN PGP PUBLIC KEY BLOCK-----/" $REVOCATION_FILE
114114

115-
# Revoke the key and delete it
116-
gpg --yes --import $REVOCATION_FILE
117-
gpg --batch --yes --delete-secret-and-public-key $GPG_FULL_KEY_ID
115+
# # Revoke the key and delete it
116+
# gpg --yes --import $REVOCATION_FILE
117+
# gpg --batch --yes --delete-secret-and-public-key $GPG_FULL_KEY_ID
118118

119119
windows-main:
120120
name:Nx Cloud - Windows Main Job
@@ -192,6 +192,7 @@ jobs:
192192
env:
193193
# Silently disable nx cloud for task runner e2e (using NX_NO_CLOUD produces a warning log)
194194
NX_CLOUD_ACCESS_TOKEN:""
195+
NX_CI_EXECUTION_ENV:"linux"
195196
NX_CLOUD_DISTRIBUTED_EXECUTION:false
196197
steps:
197198
-uses:actions/checkout@v4
@@ -224,7 +225,7 @@ jobs:
224225

225226
-name:Prepare e2e tests for task-runner
226227
if:${{ steps.check_affected.outputs.is_affected }}
227-
run:npx nx prepare-for-e2e e2e-run-task-runner
228+
run:npx nx prepare-for-e2e e2e-run-task-runner --no-cloud
228229
shell:bash
229230

230231
-name:Run e2e tests for task-runner

‎.github/workflows/other-node-versions.yml‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -78,34 +78,34 @@ jobs:
7878
git config --global user.email test@example.com
7979
git config --global user.name "Tester McPerson"
8080
81-
-name:Generate and configure GPG for signing commits and tags in E2E tests
82-
run:|
83-
# Generate a GPG key for test@example.com and store the output from stderr
84-
GPG_OUTPUT=$(echo "Key-Type: default
85-
Key-Length: 2048
86-
Subkey-Type: default
87-
Subkey-Length: 2048
88-
Name-Real: Tester McPerson
89-
Name-Email: test@example.com
90-
Expire-Date: 0
91-
%no-protection" | gpg --pinentry-mode loopback --batch --generate-key 2>&1)
92-
93-
# Find and extract the revocation file path from sdterr
94-
REVOCATION_FILE=$(echo "$GPG_OUTPUT" | grep '.rev' | tr '\n' ' ' | awk -F "'" '{print $4}')
95-
96-
# Get the GPG key ID and the full fingerprint
97-
export GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep sec | awk '{print $2}' | cut -d'/' -f2)
98-
export GPG_FULL_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep "$GPG_KEY_ID" | grep -v "sec" | awk '{print $1}' | cut -d'/' -f2)
99-
100-
# Export fingerprint and the path to the revocation file to GITHUB_ENV
101-
# This allows the last step in this job to revoke and delete the key
102-
echo "GPG_FULL_KEY_ID=$GPG_FULL_KEY_ID" >> $GITHUB_ENV
103-
echo "REVOCATION_FILE=$REVOCATION_FILE" >> $GITHUB_ENV
104-
105-
# Setup git signing for commits and tags
106-
git config commit.gpgsigntrue
107-
git config tag.gpgsigntrue
108-
git config --global user.signingkey $GPG_KEY_ID
81+
#- name: Generate and configure GPG for signing commits and tags in E2E tests
82+
# run: |
83+
# # Generate a GPG key for test@example.com and store the output from stderr
84+
# GPG_OUTPUT=$(echo "Key-Type: default
85+
# Key-Length: 2048
86+
# Subkey-Type: default
87+
# Subkey-Length: 2048
88+
# Name-Real: Tester McPerson
89+
# Name-Email: test@example.com
90+
# Expire-Date: 0
91+
# %no-protection" | gpg --pinentry-mode loopback --batch --generate-key 2>&1)
92+
93+
# # Find and extract the revocation file path from sdterr
94+
# REVOCATION_FILE=$(echo "$GPG_OUTPUT" | grep '.rev' | tr '\n' ' ' | awk -F "'" '{print $4}')
95+
96+
# # Get the GPG key ID and the full fingerprint
97+
# export GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep sec | awk '{print $2}' | cut -d'/' -f2)
98+
# export GPG_FULL_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep "$GPG_KEY_ID" | grep -v "sec" | awk '{print $1}' | cut -d'/' -f2)
99+
100+
# # Export fingerprint and the path to the revocation file to GITHUB_ENV
101+
# # This allows the last step in this job to revoke and delete the key
102+
# echo "GPG_FULL_KEY_ID=$GPG_FULL_KEY_ID" >> $GITHUB_ENV
103+
# echo "REVOCATION_FILE=$REVOCATION_FILE" >> $GITHUB_ENV
104+
105+
# # Setup git signing for commits and tags
106+
# git config commit.gpgsign true
107+
# git config tag.gpgsign true
108+
# git config --global user.signingkey $GPG_KEY_ID
109109

110110
-name:Run parallel distributed builds and tests on each node version
111111
uses:jameshenry/parallel-bash-commands@v1
@@ -133,16 +133,16 @@ jobs:
133133
if:${{ always() }}
134134
run:npx nx-cloud stop-all-agents
135135

136-
-name:Revoke and delete GPG key
137-
# It's important that we always run this step, otherwise the key will remain active if any of the steps above fail
138-
if:${{ always() }}
139-
run:|
140-
# As instructed in the text of revocation file, there is a colon that needs to be removed manually
141-
sed -i "s/:-----BEGIN PGP PUBLIC KEY BLOCK-----/-----BEGIN PGP PUBLIC KEY BLOCK-----/" $REVOCATION_FILE
136+
#- name: Revoke and delete GPG key
137+
# # It's important that we always run this step, otherwise the key will remain active if any of the steps above fail
138+
# if: ${{ always() }}
139+
# run: |
140+
# # As instructed in the text of revocation file, there is a colon that needs to be removed manually
141+
# sed -i "s/:-----BEGIN PGP PUBLIC KEY BLOCK-----/-----BEGIN PGP PUBLIC KEY BLOCK-----/" $REVOCATION_FILE
142142

143-
# Revoke the key and delete it
144-
gpg --yes --import $REVOCATION_FILE
145-
gpg --batch --yes --delete-secret-and-public-key $GPG_FULL_KEY_ID
143+
# # Revoke the key and delete it
144+
# gpg --yes --import $REVOCATION_FILE
145+
# gpg --batch --yes --delete-secret-and-public-key $GPG_FULL_KEY_ID
146146

147147
agents:
148148
name:Nx Cloud - Agent - node-${{ matrix.node }}-agent-${{ matrix.agent }}
@@ -165,34 +165,34 @@ jobs:
165165
git config --global user.email test@example.com
166166
git config --global user.name "Tester McPerson"
167167
168-
-name:Generate and configure GPG for signing commits and tags in E2E tests
169-
run:|
170-
# Generate a GPG key for test@example.com and store the output from stderr
171-
GPG_OUTPUT=$(echo "Key-Type: default
172-
Key-Length: 2048
173-
Subkey-Type: default
174-
Subkey-Length: 2048
175-
Name-Real: Tester McPerson
176-
Name-Email: test@example.com
177-
Expire-Date: 0
178-
%no-protection" | gpg --pinentry-mode loopback --batch --generate-key 2>&1)
179-
180-
# Find and extract the revocation file path from sdterr
181-
REVOCATION_FILE=$(echo "$GPG_OUTPUT" | grep '.rev' | tr '\n' ' ' | awk -F "'" '{print $4}')
182-
183-
# Get the GPG key ID and the full fingerprint
184-
export GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep sec | awk '{print $2}' | cut -d'/' -f2)
185-
export GPG_FULL_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep "$GPG_KEY_ID" | grep -v "sec" | awk '{print $1}' | cut -d'/' -f2)
186-
187-
# Export fingerprint and the path to the revocation file to GITHUB_ENV
188-
# This allows the last step in this job to revoke and delete the key
189-
echo "GPG_FULL_KEY_ID=$GPG_FULL_KEY_ID" >> $GITHUB_ENV
190-
echo "REVOCATION_FILE=$REVOCATION_FILE" >> $GITHUB_ENV
191-
192-
# Setup git signing for commits and tags
193-
git config commit.gpgsigntrue
194-
git config tag.gpgsigntrue
195-
git config --global user.signingkey $GPG_KEY_ID
168+
#- name: Generate and configure GPG for signing commits and tags in E2E tests
169+
# run: |
170+
# # Generate a GPG key for test@example.com and store the output from stderr
171+
# GPG_OUTPUT=$(echo "Key-Type: default
172+
# Key-Length: 2048
173+
# Subkey-Type: default
174+
# Subkey-Length: 2048
175+
# Name-Real: Tester McPerson
176+
# Name-Email: test@example.com
177+
# Expire-Date: 0
178+
# %no-protection" | gpg --pinentry-mode loopback --batch --generate-key 2>&1)
179+
180+
# # Find and extract the revocation file path from sdterr
181+
# REVOCATION_FILE=$(echo "$GPG_OUTPUT" | grep '.rev' | tr '\n' ' ' | awk -F "'" '{print $4}')
182+
183+
# # Get the GPG key ID and the full fingerprint
184+
# export GPG_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep sec | awk '{print $2}' | cut -d'/' -f2)
185+
# export GPG_FULL_KEY_ID=$(gpg --list-secret-keys --keyid-format LONG | grep "$GPG_KEY_ID" | grep -v "sec" | awk '{print $1}' | cut -d'/' -f2)
186+
187+
# # Export fingerprint and the path to the revocation file to GITHUB_ENV
188+
# # This allows the last step in this job to revoke and delete the key
189+
# echo "GPG_FULL_KEY_ID=$GPG_FULL_KEY_ID" >> $GITHUB_ENV
190+
# echo "REVOCATION_FILE=$REVOCATION_FILE" >> $GITHUB_ENV
191+
192+
# # Setup git signing for commits and tags
193+
# git config commit.gpgsign true
194+
# git config tag.gpgsign true
195+
# git config --global user.signingkey $GPG_KEY_ID
196196

197197
-name:Install node v${{ matrix.node }} and dependencies
198198
uses:./.github/actions/install-node-and-dependencies
@@ -209,13 +209,13 @@ jobs:
209209
env:
210210
NX_AGENT_NAME:node-${{ matrix.node }}-agent-${{ matrix.agent }}
211211

212-
-name:Revoke and delete GPG key
213-
# It's important that we always run this step, otherwise the key will remain active if any of the steps above fail
214-
if:${{ always() }}
215-
run:|
216-
# As instructed in the text of revocation file, there is a colon that needs to be removed manually
217-
sed -i "s/:-----BEGIN PGP PUBLIC KEY BLOCK-----/-----BEGIN PGP PUBLIC KEY BLOCK-----/" $REVOCATION_FILE
212+
#- name: Revoke and delete GPG key
213+
# # It's important that we always run this step, otherwise the key will remain active if any of the steps above fail
214+
# if: ${{ always() }}
215+
# run: |
216+
# # As instructed in the text of revocation file, there is a colon that needs to be removed manually
217+
# sed -i "s/:-----BEGIN PGP PUBLIC KEY BLOCK-----/-----BEGIN PGP PUBLIC KEY BLOCK-----/" $REVOCATION_FILE
218218

219-
# Revoke the key and delete it
220-
gpg --yes --import $REVOCATION_FILE
221-
gpg --batch --yes --delete-secret-and-public-key $GPG_FULL_KEY_ID
219+
# # Revoke the key and delete it
220+
# gpg --yes --import $REVOCATION_FILE
221+
# gpg --batch --yes --delete-secret-and-public-key $GPG_FULL_KEY_ID

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Lerna is a fast, modern build system for managing and publishing multiple JavaSc
1818
<br />
1919

2020
<palign="center">
21-
<a href="">
21+
<a href="https://github.com/lerna/lerna/blob/main/LICENSE">
2222
<img alt="MIT Licensed" src="https://img.shields.io/npm/l/@nrwl/workspace.svg?style=flat" />
2323
</a>
2424
<a href="https://www.npmjs.com/package/lerna">

‎e2e/run/task-runner/src/utils.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ function initializeFixture {
66
echo"⌛️ Initializing Fixture for$SUITE...\n"
77

88
# Initialize the E2E_ROOT and capture the generated path
9-
E2E_ROOT=$(npx ts-node tools/scripts/set-e2e-root.ts)
9+
E2E_ROOT=$(npx ts-node--project tools/scripts/tsconfig.e2e.jsontools/scripts/set-e2e-root.ts)
1010

1111
# Initialize the Fixture and capture the generated fixture root path
1212
FIXTURE_ROOT_PATH=$(E2E_ROOT=$E2E_ROOT npx ts-node --project$DIR/../../tsconfig.lib.json -r tsconfig-paths/register$DIR/init.ts)

‎e2e/version/src/sign-git-tag.spec.ts‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ expect.addSnapshotSerializer({
1414
* The reason is that using the `--sign-git-tag` flag requires a GPG key to be present on the machine,
1515
* which is not a guarantee in a local development environment.
1616
*/
17-
constdescribeFunc=process.env.CI==="true" ?describe :describe.skip;
17+
// const describeFunc = process.env.CI === "true" ? describe : describe.skip;
18+
19+
// TODO: Investigate issue with GPG key steps on CI
20+
constdescribeFunc=describe.skip;
1821

1922
describeFunc("lerna-version-sign-git-tag",()=>{
2023
describe("single package",()=>{
@@ -46,7 +49,7 @@ describeFunc("lerna-version-sign-git-tag", () => {
4649
Changes:
4750
- package-a: 0.0.0 => 3.3.3
4851
49-
lerna info auto-confirmed
52+
lerna info auto-confirmed
5053
lerna info execute Skipping releases
5154
lerna info git Pushing tags...
5255
lerna success version finished
@@ -78,7 +81,7 @@ describeFunc("lerna-version-sign-git-tag", () => {
7881
Changes:
7982
- package-a: 0.0.0 => 3.4.5
8083
81-
lerna info auto-confirmed
84+
lerna info auto-confirmed
8285
lerna info execute Skipping releases
8386
lerna info git Pushing tags...
8487
lerna success version finished
@@ -130,7 +133,7 @@ describeFunc("lerna-version-sign-git-tag", () => {
130133
- package-a: 0.0.0 => 3.3.3
131134
- package-b: 0.0.0 => 3.3.3
132135
133-
lerna info auto-confirmed
136+
lerna info auto-confirmed
134137
lerna info execute Skipping releases
135138
lerna info git Pushing tags...
136139
lerna success version finished
@@ -163,7 +166,7 @@ describeFunc("lerna-version-sign-git-tag", () => {
163166
- package-a: 0.0.0 => 3.4.5
164167
- package-b: 0.0.0 => 3.4.5
165168
166-
lerna info auto-confirmed
169+
lerna info auto-confirmed
167170
lerna info execute Skipping releases
168171
lerna info git Pushing tags...
169172
lerna success version finished
@@ -216,7 +219,7 @@ describeFunc("lerna-version-sign-git-tag", () => {
216219
- package-a: 1.0.0 => 3.3.3
217220
- package-b: 1.0.0 => 3.3.3
218221
219-
lerna info auto-confirmed
222+
lerna info auto-confirmed
220223
lerna info execute Skipping releases
221224
lerna info git Pushing tags...
222225
lerna success version finished
@@ -259,7 +262,7 @@ describeFunc("lerna-version-sign-git-tag", () => {
259262
- package-a: 1.0.0 => 3.4.5
260263
- package-b: 1.0.0 => 3.4.5
261264
262-
lerna info auto-confirmed
265+
lerna info auto-confirmed
263266
lerna info execute Skipping releases
264267
lerna info git Pushing tags...
265268
lerna success version finished

‎jest-global-setup.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module.exports=async()=>{
2+
// Plugin isolation is not relevant to lerna or its tests
3+
process.env.NX_ISOLATE_PLUGINS="false";
4+
};

‎jest.config.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import{getJestProjectsAsync}from"@nx/jest";
2+
importtype{Config}from"jest";
23

3-
exportdefaultasync()=>({
4+
exportdefaultasync():Promise<Config>=>({
45
projects:awaitgetJestProjectsAsync(),
56
});

‎jest.preset.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
// eslint-disable-next-line import/no-extraneous-dependencies, node/no-unpublished-require
1+
/* eslint-disable */
22
constnxPreset=require("@nx/jest/preset").default;
3+
const{ workspaceRoot}=require("@nx/devkit");
4+
const{ join}=require("node:path");
5+
/* eslint-enable */
36

47
module.exports={
58
...nxPreset,
@@ -16,4 +19,5 @@ module.exports = {
1619
* More info: https://jestjs.io/docs/upgrading-to-jest29#snapshot-format
1720
*/
1821
snapshotFormat:{escapeString:true,printBasicPrototype:true},
22+
globalSetup:join(workspaceRoot,"jest-global-setup.js"),
1923
};

‎libs/commands/changed/jest.config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ export default {
44
preset:"../../../jest.preset.js",
55
coverageDirectory:"../../../coverage/libs/commands/changed",
66
moduleFileExtensions:["ts","tsx","js","jsx","json"],
7+
testTimeout:45e3,
78
};

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp