Skip to content

Commit e3de2d0

Browse files
committed
[CI] Rework app-tests job to use npm as user's packages manager
1 parent 8ab561f commit e3de2d0

File tree

5 files changed

+44
-16
lines changed

5 files changed

+44
-16
lines changed

.github/workflows/app-tests.yaml

Lines changed: 37 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ jobs:
4040
cache-dependency-path: |
4141
package.json
4242
src/**/package.json
43-
test_apps/encore-app/pnpm-lock.yaml
4443
test_apps/encore-app/package.json
4544
4645
- uses: shivammathur/setup-php@v2
@@ -60,35 +59,57 @@ jobs:
6059
working-directory: test_apps/encore-app
6160
dependency-versions: highest
6261

62+
- name: Manually replacing "workspace:*" references
63+
run: |
64+
# npm does not support "workspace:*" references, so we need to replace them with the actual package path
65+
for PACKAGE_DATA in $(pnpm ls -r --json --depth -1 | jq 'map(select(.private != true))' | jq -c '.[]'); do
66+
PACKAGE=$(echo $PACKAGE_DATA | jq -r '.name')
67+
PACKAGE_PATH=$(echo $PACKAGE_DATA | jq -r '.path')
68+
69+
echo "🔍 Searching for \"workspace:*\" references in $PACKAGE_PATH/package.json"
70+
71+
# Manually replace "workspace:" constraints with the actual package version, it ensure packages can be installed with npm
72+
jq -rc '[(.dependencies // {}) + (.devDependencies // {}) | to_entries[] | select(.value == "workspace:*") | .key][]' "$PACKAGE_PATH/package.json" | while read -r PACKAGE_FROM_WORKSPACE ; do
73+
# Extract the resolved version of the package from the workspace, e.g.: "link:../../../../assets"
74+
echo "ℹ️ Found \"$PACKAGE_FROM_WORKSPACE\" with \"workspace:*\""
75+
76+
PACKAGE_FROM_WORKSPACE_PATH=$(pnpm ls --filter $PACKAGE_FROM_WORKSPACE --json --depth -1 | jq -r '.[].path')
77+
echo "ℹ️ The package \"$PACKAGE_FROM_WORKSPACE\" is located in \"$PACKAGE_FROM_WORKSPACE_PATH\" directory"
78+
79+
echo "⚒️ Replacing \"$PACKAGE_FROM_WORKSPACE\" with \"file:$PACKAGE_FROM_WORKSPACE_PATH\" in $PACKAGE_PATH/package.json"
80+
sed -i "s|\"$PACKAGE_FROM_WORKSPACE\": \"workspace:\*\"|\"$PACKAGE_FROM_WORKSPACE\": \"file:$PACKAGE_FROM_WORKSPACE_PATH\"|g" "$PACKAGE_PATH/package.json"
81+
done;
82+
done
83+
6384
- working-directory: test_apps/encore-app
64-
run: pnpm install --ignore-workspace
85+
run: npm install
6586

6687
- if: matrix.ux-packages-source == 'js-packages'
6788
name: Install UX JS packages with a JS package manager
6889
working-directory: test_apps/encore-app
6990
run: |
7091
PACKAGES_TO_INSTALL=''
71-
for PACKAGE in $(cd ../..; pnpm ls -r --json --depth -1 | jq 'map(select(.private != true))' | jq -c '.[]'); do
72-
PACKAGE_ABSOLUTE_PATH=$(echo $PACKAGE | jq -r '.path')
73-
PACKAGE_RELATIVE_PATH=$(realpath --relative-to=. "$PACKAGE_ABSOLUTE_PATH")
74-
PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL file:$PACKAGE_RELATIVE_PATH"
92+
for PACKAGE_DATA in $(pnpm ls -r --json --depth -1 | jq 'map(select(.private != true))' | jq -c '.[]'); do
93+
PACKAGE_PATH=$(echo $PACKAGE_DATA | jq -r '.path')
94+
PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL file:$(realpath --relative-to=. "$PACKAGE_PATH")"
7595
done
96+
7697
echo "Installing packages: $PACKAGES_TO_INSTALL"
77-
pnpm add --save-dev $PACKAGES_TO_INSTALL
98+
npm add --save-dev $PACKAGES_TO_INSTALL
7899
79100
- name: Ensure UX packages are installed from "${{ env.EXPECTED_PATTERN }}"
80101
working-directory: test_apps/encore-app
81102
run: |
82-
for PACKAGE in $(cat package.json | jq -c '(.dependencies // {}) + (.devDependencies // {}) | to_entries[] | select(.key | startswith("@symfony/ux-")) | {name: .key, version: .value}'); do
83-
PACKAGE_NAME=$(echo $PACKAGE | jq -r '.name')
84-
PACKAGE_VERSION=$(echo $PACKAGE | jq -r '.version')
103+
for PACKAGE_DATA in $(cat package.json | jq -c '(.dependencies // {}) + (.devDependencies // {}) | to_entries[] | select(.key | startswith("@symfony/ux-")) | {name: .key, version: .value}'); do
104+
PACKAGE=$(echo $PACKAGE_DATA | jq -r '.name')
105+
PACKAGE_VERSION=$(echo $PACKAGE_DATA | jq -r '.version')
85106
86-
echo -n "Checking $PACKAGE_NAME@$PACKAGE_VERSION..."
107+
echo -n "Checking $PACKAGE@$PACKAGE_VERSION..."
87108
if [[ $PACKAGE_VERSION == $EXPECTED_PATTERN* ]]; then
88-
echo " OK"
109+
echo " OK"
89110
else
90-
echo " KO"
91-
echo "The package version of $PACKAGE_NAME must starts with the pattern (e.g.: $EXPECTED_PATTERN), got $PACKAGE_VERSION instead."
111+
echo " KO"
112+
echo "ℹ️ The package version of $PACKAGE must starts with the pattern (e.g.: $EXPECTED_PATTERN), got $PACKAGE_VERSION instead."
92113
exit 1
93114
fi
94115
done;
@@ -97,8 +118,8 @@ jobs:
97118

98119
- name: Ensure project can be built in dev mode
99120
working-directory: test_apps/encore-app
100-
run: pnpm run dev
121+
run: npm run dev
101122

102123
- name: Ensure project can be built in prod mode
103124
working-directory: test_apps/encore-app
104-
run: pnpm run build
125+
run: npm run build

.github/workflows/code-quality.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ on:
66
- 'src/*/doc/**'
77
- 'src/**/*.md'
88
- 'ux.symfony.com/**'
9+
- '.github/workflows/app-tests.yaml'
910
pull_request:
1011
paths-ignore:
1112
- 'src/*/doc/**'
1213
- 'src/**/*.md'
1314
- 'ux.symfony.com/**'
15+
- '.github/workflows/app-tests.yaml'
1416

1517
concurrency:
1618
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.github/workflows/unit-tests.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@ on:
1010
- 'src/*/doc/**'
1111
- 'src/**/*.md'
1212
- 'ux.symfony.com/**'
13+
- '.github/workflows/app-tests.yaml'
1314
pull_request:
1415
paths-ignore:
1516
- 'src/*/doc/**'
1617
- 'src/**/*.md'
1718
- 'ux.symfony.com/**'
19+
- '.github/workflows/app-tests.yaml'
1820

1921
concurrency:
2022
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.github/workflows/ux.symfony.com.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ on:
88
- '!src/*/doc/**'
99
- '!src/**/*.md'
1010
- '.github/**'
11+
- '!.github/workflows/app-tests.yaml'
1112
pull_request:
1213
paths:
1314
- 'ux.symfony.com/**'
1415
- 'src/*/**'
1516
- '!src/*/doc/**'
1617
- '!src/**/*.md'
1718
- '.github/**'
19+
- '!.github/workflows/app-tests.yaml'
1820

1921
jobs:
2022

test_apps/encore-app/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
composer.lock
2+
package-lock.json
23

34
###> symfony/framework-bundle ###
45
/.env.local

0 commit comments

Comments
 (0)