From fefd51dff4b3625f6fa4032fee54e1ca3834193d Mon Sep 17 00:00:00 2001 From: Thomas Lehmann Date: Tue, 9 Jul 2024 15:45:39 +0200 Subject: [PATCH 1/9] IONOS: Update submodule pointer for /IONOS Latest changes: * app install / enable refactoring * enabling apps Signed-off-by: Thomas Lehmann --- IONOS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IONOS b/IONOS index 737dc0b163d2e..0957d28df8be6 160000 --- a/IONOS +++ b/IONOS @@ -1 +1 @@ -Subproject commit 737dc0b163d2e95d99e94b4b3c17cd2a987f2e80 +Subproject commit 0957d28df8be6c7f1829226b191ab54696b67853 From 27e2af972c7c80d11134834e7029dbc0b30b3745 Mon Sep 17 00:00:00 2001 From: Thomas Lehmann Date: Mon, 8 Jul 2024 17:21:15 +0200 Subject: [PATCH 2/9] IONOS: packages: set engines to Node ^20.15.0 and npm ^10.7.0 Actually required for the custom and external apps. Since the workflow starts in the project root, it initially "sees" the Nextcloud package.json. Since entering each app directory and setting up different Node/npm versions is no feasible anyway, let's set it here. --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 96563b47050d5..c8d4b59da1d40 100644 --- a/package.json +++ b/package.json @@ -194,8 +194,8 @@ "extends @nextcloud/browserslist-config" ], "engines": { - "node": "^20.0.0", - "npm": "^10.0.0" + "node": "^20.15.0", + "npm": "^10.7.0" }, "overrides": { "colors": "1.4.0" From 15e89501d78b570fd49f7001b1ebeca08b79c120 Mon Sep 17 00:00:00 2001 From: Thomas Lehmann Date: Tue, 9 Jul 2024 09:57:01 +0200 Subject: [PATCH 3/9] IONOS: Add user_oidc v5.0.3 as submodule under apps-external --- .gitmodules | 3 +++ apps-external/user_oidc | 1 + 2 files changed, 4 insertions(+) create mode 160000 apps-external/user_oidc diff --git a/.gitmodules b/.gitmodules index 16861b2f9fe6b..1809970b9b5d7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "apps-custom/simplesettings"] path = apps-custom/simplesettings url = git@github.com:IONOS-Productivity/nc-simplesettings.git +[submodule "apps-external/user_oidc"] + path = apps-external/user_oidc + url = https://github.com/nextcloud/user_oidc.git diff --git a/apps-external/user_oidc b/apps-external/user_oidc new file mode 160000 index 0000000000000..eaec3bbcb6d57 --- /dev/null +++ b/apps-external/user_oidc @@ -0,0 +1 @@ +Subproject commit eaec3bbcb6d57c96250738ea01e25ba34ab88546 From 3d13d7edf9d962d2eae75dfa870052715168885f Mon Sep 17 00:00:00 2001 From: Thomas Lehmann Date: Tue, 9 Jul 2024 09:57:41 +0200 Subject: [PATCH 4/9] IONOS: un.gitignore apps-external/user_oidc To track it as submodule in version control --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 95e3a66756453..941885efa2a83 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,7 @@ /apps/files_external/tests/config.*.php # IONOS: this should not be upsteamed! !/apps-external/viewer +!/apps-external/user_oidc !/apps-custom/* # apps modules From 92b06f18ce1a0e5da97c9d8e112fd51ed126873a Mon Sep 17 00:00:00 2001 From: Thomas Lehmann Date: Tue, 9 Jul 2024 11:40:59 +0200 Subject: [PATCH 5/9] IONOS: workflow: don't package generated dirs in apps-* Exclude node_modules, tests and GitHub/Gut dirs too. --- .github/workflows/easycloud-build.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/easycloud-build.yml b/.github/workflows/easycloud-build.yml index 75890fb66dd85..1ee91a04fbdf5 100644 --- a/.github/workflows/easycloud-build.yml +++ b/.github/workflows/easycloud-build.yml @@ -89,6 +89,15 @@ jobs: version.json \ -x "apps/theming/img/background/**" \ -x "apps/*/tests/**" \ + -x "apps-custom/*/.git" \ + -x "apps-custom/*/.github" \ + -x "apps-custom/*/src**" \ + -x "apps-custom/*/node_modules**" \ + -x "apps-custom/*/tests**" \ + -x "apps-external/*/.git" \ + -x "apps-external/*/.github" \ + -x "apps-external/*/node_modules**" \ + -x "apps-external/*/src**" \ -x "apps-external/*/tests**" \ -x "**/cypress/**" \ -x "*.git*" \ From 02cd9bed2ad7c6bb7a899f021f24672f67e582e4 Mon Sep 17 00:00:00 2001 From: Thomas Lehmann Date: Mon, 8 Jul 2024 16:35:53 +0200 Subject: [PATCH 6/9] IONOS: Add build steps to build parts of apps-custom/ and apps-external/ Build simplesettings (custom) and user_oidc (external) --- .github/workflows/easycloud-build.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/easycloud-build.yml b/.github/workflows/easycloud-build.yml index 1ee91a04fbdf5..6a3822979796a 100644 --- a/.github/workflows/easycloud-build.yml +++ b/.github/workflows/easycloud-build.yml @@ -46,6 +46,26 @@ jobs: with: submodules: true + - name: Set up node ${{ steps.versions.outputs.nodeVersion }} + uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 + with: + node-version-file: "package.json" + + - name: Install dependencies & build + env: + CYPRESS_INSTALL_BINARY: 0 + PUPPETEER_SKIP_DOWNLOAD: true + run: | + npm --version + cd apps-custom/simplesettings + npm ci + npm run build + cd ../.. + cd apps-external/user_oidc + npm ci + npm run build + cd ../.. + - name: Zip dependencies run: | buildDate=$(date +%s) From b6a28844092689ee36f77e3b1423a616218b43af Mon Sep 17 00:00:00 2001 From: Thomas Lehmann Date: Tue, 9 Jul 2024 16:07:38 +0200 Subject: [PATCH 7/9] IONOS: Update submodule pointer for /IONOS * Enable custom apps too * user_oidc will no longer be downloaded Signed-off-by: Thomas Lehmann --- IONOS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IONOS b/IONOS index 0957d28df8be6..93ce4f86a9722 160000 --- a/IONOS +++ b/IONOS @@ -1 +1 @@ -Subproject commit 0957d28df8be6c7f1829226b191ab54696b67853 +Subproject commit 93ce4f86a9722b2a9acbcf5aaa12ed6cefc92b00 From 7ed6cb9e7a934301a92f1abe64f069833de040aa Mon Sep 17 00:00:00 2001 From: "Misha M.-Kupriyanov" Date: Wed, 10 Jul 2024 17:37:58 +0200 Subject: [PATCH 8/9] fixup! IONOS: Add build steps to build parts of apps-custom/ and apps-external/ remove not defined steps variables Signed-off-by: Misha M.-Kupriyanov --- .github/workflows/easycloud-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/easycloud-build.yml b/.github/workflows/easycloud-build.yml index 6a3822979796a..a23d0ff362e85 100644 --- a/.github/workflows/easycloud-build.yml +++ b/.github/workflows/easycloud-build.yml @@ -1,7 +1,7 @@ name: EasyCloud Build # The EasyCloud source is packaged as a container image. -# This is a workaround because releases can not be created without tags +# This is a workaround because releases can not be created without tags # and we want to be able to create snapshots from branches. on: @@ -46,7 +46,7 @@ jobs: with: submodules: true - - name: Set up node ${{ steps.versions.outputs.nodeVersion }} + - name: Set up node uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: node-version-file: "package.json" From acfd9158a6f9d057bc85728a7793940366a0d14f Mon Sep 17 00:00:00 2001 From: "Misha M.-Kupriyanov" Date: Wed, 10 Jul 2024 17:42:36 +0200 Subject: [PATCH 9/9] fixup! IONOS: Add build steps to build parts of apps-custom/ and apps-external/ split into unique steps Signed-off-by: Misha M.-Kupriyanov --- .github/workflows/easycloud-build.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/easycloud-build.yml b/.github/workflows/easycloud-build.yml index a23d0ff362e85..37a1c8d5b02f2 100644 --- a/.github/workflows/easycloud-build.yml +++ b/.github/workflows/easycloud-build.yml @@ -51,20 +51,23 @@ jobs: with: node-version-file: "package.json" - - name: Install dependencies & build + - name: Install dependencies & build simplesettings app env: CYPRESS_INSTALL_BINARY: 0 PUPPETEER_SKIP_DOWNLOAD: true run: | - npm --version cd apps-custom/simplesettings npm ci npm run build - cd ../.. + + - name: Install dependencies & build user_oidc app + env: + CYPRESS_INSTALL_BINARY: 0 + PUPPETEER_SKIP_DOWNLOAD: true + run: | cd apps-external/user_oidc npm ci npm run build - cd ../.. - name: Zip dependencies run: |