Skip to content

Commit 80711c3

Browse files
devineadevinea
committed
Merge remote-tracking branch 'origin/main' into ui5_deps_upgrade
* origin/main: chore: apply latest changesets chore: update pipeline to publish extensions as draft (#3807) chore: apply latest changesets fix(fiori-annotation-api): move and delete (#3785) chore: apply latest changesets generalise pipeline config (#3804) chore: apply latest changesets test config updates (#3803) chore: apply latest changesets correct sap systems extension naming in config (#3802) chore: apply latest changesets pipeline config test for extension (#3801) chore: apply latest changesets fix(preview-middleware): i18n handling for cards generator (#3736) chore: apply latest changesets feat(preview-middleware): enable card generator for CAP projects (#3737) chore: apply latest changesets Feat: add question to store the system created/modified via generator, add warning to password input (#3720)
2 parents a3147e6 + 7ae35f5 commit 80711c3

File tree

57 files changed

+1332
-157
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1332
-157
lines changed

‎.github/workflows/pipeline.yml‎

Lines changed: 36 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,6 @@ jobs:
5959
- name: Validate changeset files if found
6060
if: steps.check_changeset_files.outputs.files_exists == 'true'
6161
run: pnpm changeset status
62-
- name: Package SAP Systems VSCode extension
63-
if: steps.check_changeset_files.outputs.files_exists == 'true' && matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
64-
run: |
65-
if grep -R "sap-ux-sap-systems-ext" .changeset/*.md >/dev/null 2>&1; then
66-
echo "sap-systems-ext referenced in changeset. Packaging extension..."
67-
pnpm --filter sap-ux-sap-systems-ext ide-ext:package
68-
else
69-
echo "sap-systems-ext not referenced in changeset. Skipping packaging."
70-
fi
7162
- name: Cache playwright browsers
7263
id: cache-playwright-browsers
7364
uses: actions/cache@v4
@@ -216,17 +207,42 @@ jobs:
216207
publish: pnpm ci:publish
217208
env:
218209
GITHUB_TOKEN: ${{ secrets.ACCESS_PAT }}
219-
- name: Create GitHub Release (sap-systems-ext)
220-
if: env.SAP_SYSTEMS_EXT_CHANGED == 'true'
210+
- name: Detect extension publication
211+
if: steps.changesetPublish.outputs.published == 'true'
212+
run: |
213+
PUBLISHED=$(echo '${{ steps.changesetPublish.outputs.publishedPackages }}' | jq -r '.[].name')
214+
# Extract the first package name matching sap-ux-*-ext
215+
EXT_PKG=$(echo "$PUBLISHED" | grep -E '^sap-ux-.*-ext$' | head -n 1 || true)
216+
217+
if [ -n "$EXT_PKG" ]; then
218+
echo "EXTENSION_UPDATED=true" >> $GITHUB_ENV
219+
echo "EXT_PKG=$EXT_PKG" >> $GITHUB_ENV
220+
221+
# Strip 'sap-ux-' prefix to derive directory name
222+
EXT_DIR_NAME=$(echo "$EXT_PKG" | sed 's/^sap-ux-//')
223+
echo "EXT_DIR=packages/${EXT_DIR_NAME}" >> $GITHUB_ENV
224+
else
225+
echo "EXTENSION_UPDATED=false" >> $GITHUB_ENV
226+
fi
227+
- name: Read extension version
228+
if: env.EXTENSION_UPDATED == 'true'
229+
run: |
230+
EXT_VERSION=$(jq -r '.version' "${{ env.EXT_DIR }}/package.json")
231+
echo "EXT_VERSION=$EXT_VERSION" >> $GITHUB_ENV
232+
- name: Package VSCode extension
233+
if: env.EXTENSION_UPDATED == 'true'
234+
run: pnpm --filter ${{ env.EXT_PKG }} ide-ext:package
235+
- name: Create GitHub Release (extension)
236+
if: env.EXTENSION_UPDATED == 'true'
221237
uses: softprops/action-gh-release@v1
222238
with:
223-
tag_name: sap-systems-ext@${{ env.EXT_VERSION }}
224-
name: sap-systems-ext v${{ env.EXT_VERSION }}
225-
body: 'VSCode SAP Systems extension v${{ env.EXT_VERSION }} release.'
226-
draft: false
239+
tag_name: ${{ env.EXT_PKG }}@${{ env.EXT_VERSION }}
240+
name: ${{ env.EXT_PKG }} v${{ env.EXT_VERSION }}
241+
body: 'Extension release: ${{ env.EXT_PKG }} v${{ env.EXT_VERSION }}'
242+
draft: true
227243
prerelease: false
228244
generate_release_notes: true
229-
files: packages/sap-systems-ext/*.vsix
245+
files: ${{ env.EXT_DIR }}/*.vsix
230246
fail_on_unmatched_files: true
231247
env:
232248
GITHUB_TOKEN: ${{ secrets.ACCESS_PAT }}
@@ -240,9 +256,10 @@ jobs:
240256
echo "$(echo '${{ steps.changesetPublish.outputs.publishedPackages }}' | jq --raw-output 'map("*" + .name + "*" + " - " + "<https://www.npmjs.com/package/" + .name + "|" + .version + ">") | join("\\n")')" >> $GITHUB_ENV
241257
echo "$EOF" >> $GITHUB_ENV
242258
- name: Prepare Slack notification message (extension release only)
243-
if: steps.changesetPublish.outputs.published != 'true' && env.SAP_SYSTEMS_EXT_CHANGED == 'true'
259+
if: env.EXTENSION_UPDATED == 'true'
244260
run: |
245-
echo "EXT_RELEASE_MESSAGE=:package: VSCode SAP Systems extension v${{ env.EXT_VERSION }} released (private package)." >> $GITHUB_ENV
261+
RELEASE_URL="https://github.com/${{ github.repository }}/releases/tag/${{ env.EXT_PKG }}@${{ env.EXT_VERSION }}"
262+
echo "EXT_RELEASE_MESSAGE=:package: Extension *${{ env.EXT_PKG }}* v${{ env.EXT_VERSION }} released - <${RELEASE_URL}|View on GitHub>" >> $GITHUB_ENV
246263
- name: Send Slack notification (published packages)
247264
if: steps.changesetPublish.outputs.published == 'true'
248265
uses: slackapi/slack-github-action@v1.26.0
@@ -252,7 +269,7 @@ jobs:
252269
env:
253270
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
254271
- name: Send Slack notification (extension release)
255-
if: steps.changesetPublish.outputs.published != 'true' && env.SAP_SYSTEMS_EXT_CHANGED == 'true'
272+
if: env.EXTENSION_UPDATED == 'true'
256273
uses: slackapi/slack-github-action@v1.26.0
257274
with:
258275
payload: |

‎examples/fe-fpm-cli/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @sap-ux/fe-fpm-cli
22

3+
## 0.1.54
4+
5+
### Patch Changes
6+
7+
- @sap-ux/fe-fpm-writer@0.39.16
8+
39
## 0.1.53
410

511
### Patch Changes

‎examples/fe-fpm-cli/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sap-ux/fe-fpm-cli",
3-
"version": "0.1.53",
3+
"version": "0.1.54",
44
"description": "A simple CLI to prompt required information to create a building block using the fe-fpm-writer module's prompt and generate functions.",
55
"license": "Apache-2.0",
66
"private": true,

‎examples/simple-generator/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @sap-ux/generator-simple-fe
22

3+
## 1.1.106
4+
5+
### Patch Changes
6+
7+
- @sap-ux/fiori-elements-writer@2.7.35
8+
39
## 1.1.105
410

511
### Patch Changes

‎examples/simple-generator/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sap-ux/generator-simple-fe",
3-
"version": "1.1.105",
3+
"version": "1.1.106",
44
"description": "Simple example of a yeoman generator for Fiori elements.",
55
"license": "Apache-2.0",
66
"private": true,

‎packages/annotation-generator/CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# @sap-ux/annotation-generator
22

3+
## 0.3.73
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [271847c]
8+
- @sap-ux/fiori-annotation-api@0.7.11
9+
310
## 0.3.72
411

512
### Patch Changes

‎packages/annotation-generator/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sap-ux/annotation-generator",
3-
"version": "0.3.72",
3+
"version": "0.3.73",
44
"description": "Library that provides API for generation of annotations by SAP Fiori App Generator",
55
"publisher": "SAPSE",
66
"repository": {

‎packages/create/CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# @sap-ux/create
22

3+
## 0.13.156
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [db63f7b]
8+
- @sap-ux/preview-middleware@0.23.46
9+
- @sap-ux/app-config-writer@0.6.55
10+
11+
## 0.13.155
12+
13+
### Patch Changes
14+
15+
- Updated dependencies [e985618]
16+
- @sap-ux/preview-middleware@0.23.45
17+
- @sap-ux/app-config-writer@0.6.55
18+
319
## 0.13.154
420

521
### Patch Changes

‎packages/create/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@sap-ux/create",
33
"description": "SAP Fiori tools module to add or remove features",
4-
"version": "0.13.154",
4+
"version": "0.13.156",
55
"repository": {
66
"type": "git",
77
"url": "https://github.com/SAP/open-ux-tools.git",

‎packages/deploy-config-sub-generator/CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# @sap-ux/deploy-config-sub-generator
22

3+
## 0.4.42
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [10a3b57]
8+
- @sap-ux/odata-service-inquirer@2.11.0
9+
310
## 0.4.41
411

512
### Patch Changes

0 commit comments

Comments
 (0)