Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 43 additions & 15 deletions .github/workflows/build-artifact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@ jobs:
"has_npm": false,
"has_composer": true,
"makefile_target": "build_files_antivirus_app"
},
{
"name": "notify_push",
"path": "apps-external/notify_push",
"has_npm": false,
"has_composer": true,
"makefile_target": "build_notify_push_app"
}
]'

Expand Down Expand Up @@ -165,23 +172,44 @@ jobs:
submodules: true
fetch-depth: '1'

- name: Download richdocuments app
- name: Download build external apps
uses: actions/download-artifact@v5
with:
name: external-app-build-richdocuments
path: apps-external/richdocuments
pattern: external-app-build-*
path: apps-external/

- name: Download viewer app
uses: actions/download-artifact@v5
with:
name: external-app-build-viewer
path: apps-external/viewer
- name: Reorganize downloaded apps-external artifacts
run: |
cd apps-external/

echo "Initial structure:"
ls -la

# Move contents from external-app-build-* directories to their target directories
for artifact_dir in external-app-build-*; do
if [ -d "$artifact_dir" ]; then
# Extract app name from artifact directory name
app_name=${artifact_dir#external-app-build-}

echo "Processing artifact: $artifact_dir -> $app_name"

# If target directory exists, merge the contents from the artifact directory containing build artifacts
if [ -d "$app_name" ]; then
echo "Target directory $app_name exists, merging contents from $artifact_dir"
# Copy contents from artifact directory to target directory
cp -r "$artifact_dir"/* "$app_name"/
# Remove the now-empty artifact directory
rm -rf "$artifact_dir"
else
# Move the artifact directory to the proper app name
echo "Moving $artifact_dir to $app_name"
mv "$artifact_dir" "$app_name"
fi
fi
done

- name: Download contacts app
uses: actions/download-artifact@v5
with:
name: external-app-build-contacts
path: apps-external/contacts
echo "Reorganization complete. Final structure:"
ls -la

- name: Verify downloaded artifacts structure
run: |
Expand Down Expand Up @@ -306,7 +334,7 @@ jobs:
fi

- name: Download artifact zip
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
uses: actions/download-artifact@v5
with:
name: nextcloud_workspace_build_artifact

Expand Down Expand Up @@ -372,7 +400,7 @@ jobs:

steps:
- name: Download artifact zip
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: nextcloud_workspace_build_artifact

Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@
[submodule "apps-external/files_antivirus"]
path = apps-external/files_antivirus
url = [email protected]:nextcloud/files_antivirus.git
[submodule "apps-external/notify_push"]
path = apps-external/notify_push
url = [email protected]:nextcloud/notify_push.git
2 changes: 1 addition & 1 deletion IONOS
Submodule IONOS updated 2 files
+34 −2 Makefile
+8 −0 configure.sh
1 change: 1 addition & 0 deletions apps-external/notify_push
Submodule notify_push added at c721a4
Loading