Skip to content

Commit 5ab6f65

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

File tree

6 files changed

+34
-7269
lines changed

6 files changed

+34
-7269
lines changed

.github/workflows/app-tests.yaml

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,35 +60,53 @@ jobs:
6060
working-directory: test_apps/encore-app
6161
dependency-versions: highest
6262

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

6683
- if: matrix.ux-packages-source == 'js-packages'
6784
name: Install UX JS packages with a JS package manager
6885
working-directory: test_apps/encore-app
6986
run: |
7087
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')
88+
for PACKAGE_DATA in $(cd ../..; pnpm ls -r --json --depth -1 | jq 'map(select(.private != true))' | jq -c '.[]'); do
89+
PACKAGE_ABSOLUTE_PATH=$(echo $PACKAGE_DATA | jq -r '.path')
7390
PACKAGE_RELATIVE_PATH=$(realpath --relative-to=. "$PACKAGE_ABSOLUTE_PATH")
7491
PACKAGES_TO_INSTALL="$PACKAGES_TO_INSTALL file:$PACKAGE_RELATIVE_PATH"
7592
done
93+
7694
echo "Installing packages: $PACKAGES_TO_INSTALL"
77-
pnpm add --save-dev $PACKAGES_TO_INSTALL
95+
npm add --save-dev $PACKAGES_TO_INSTALL
7896
7997
- name: Ensure UX packages are installed from "${{ env.EXPECTED_PATTERN }}"
8098
working-directory: test_apps/encore-app
8199
run: |
82100
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')
101+
PACKAGE=$(echo $PACKAGE | jq -r '.name')
84102
PACKAGE_VERSION=$(echo $PACKAGE | jq -r '.version')
85103
86-
echo -n "Checking $PACKAGE_NAME@$PACKAGE_VERSION..."
104+
echo -n "Checking $PACKAGE@$PACKAGE_VERSION..."
87105
if [[ $PACKAGE_VERSION == $EXPECTED_PATTERN* ]]; then
88106
echo " OK"
89107
else
90108
echo " KO"
91-
echo "The package version of $PACKAGE_NAME must starts with the pattern (e.g.: $EXPECTED_PATTERN), got $PACKAGE_VERSION instead."
109+
echo "The package version of $PACKAGE must starts with the pattern (e.g.: $EXPECTED_PATTERN), got $PACKAGE_VERSION instead."
92110
exit 1
93111
fi
94112
done;
@@ -97,8 +115,8 @@ jobs:
97115

98116
- name: Ensure project can be built in dev mode
99117
working-directory: test_apps/encore-app
100-
run: pnpm run dev
118+
run: npm run dev
101119

102120
- name: Ensure project can be built in prod mode
103121
working-directory: test_apps/encore-app
104-
run: pnpm run build
122+
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)