From 25c904cea1189b349aab4339075336e34ef8a748 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Tue, 14 Oct 2025 14:43:52 +0530 Subject: [PATCH 01/18] updated gitlab for publish step --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 08326169..8a7949e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,7 @@ stages: - build - performance - dast + - publish - deploy variables: @@ -23,6 +24,9 @@ include: - project: "e/infra/ecloud/nextcloud-apps/ci-templates" ref: main file: "populate-code-climate-default-config.yml" + - project: "e/infra/ecloud/nextcloud-apps/ci-templates" + ref: main + file: "nc-publish-app.yml" build-vendor: stage: build -- GitLab From ed8c0dc46af33c47ec316448d777eac7e6001349 Mon Sep 17 00:00:00 2001 From: theronakpatel Date: Wed, 15 Oct 2025 16:47:45 +0530 Subject: [PATCH 02/18] ci: add GitLab pipeline to build and publish artifacts --- .gitlab-ci.yml | 111 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a7949e3..1f50aaf3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,114 @@ +stages: + - build + - publish + +default: + interruptible: true + before_script: + - 'echo "Running on $(uname -a)"' + +.rules_default: &rules_default + rules: + - if: '$CI_COMMIT_TAG' + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + - when: manual + allow_failure: true + +.extract_version: &extract_version + - | + set -euo pipefail + echo "Deriving package version from appinfo/info.xml ..." + RAW_VERSION=$(xmllint --xpath 'string(/info/version)' appinfo/info.xml 2>/dev/null || true) + if [ -z "${RAW_VERSION:-}" ]; then + RAW_VERSION=$(grep -oP '\K[^<]+' appinfo/info.xml | head -n1 || true) + fi + if [ -z "${RAW_VERSION:-}" ]; then + echo "Could not extract version from appinfo/info.xml" >&2 + exit 1 + fi + RAW_VERSION=${RAW_VERSION#v} + if [ -n "${CI_COMMIT_TAG:-}" ]; then + PACKAGE_VERSION="${CI_COMMIT_TAG#v}" + else + # Append short SHA to make version unique for non-tag builds + PACKAGE_VERSION="${RAW_VERSION}-${CI_COMMIT_SHORT_SHA}" + fi + echo "PACKAGE_VERSION=${PACKAGE_VERSION}" | tee -a version.env + +variables: + NODE_ENV: production + npm_config_ci: 'true' + +cache: + paths: + - .npm/ + - vendor/cache/ + +build:vendor: + stage: build + image: composer:2 + needs: [] + <<: *rules_default + before_script: + - composer --version + - php -v + script: + - *extract_version + - composer install --no-dev --prefer-dist --no-progress --optimize-autoloader --classmap-authoritative + - tar -czf vendor.tar.gz vendor + artifacts: + name: "vendor-$CI_COMMIT_REF_SLUG" + paths: + - vendor.tar.gz + - version.env + expire_in: 7 days + +build:frontend: + stage: build + image: node:16-bullseye + needs: [] + <<: *rules_default + before_script: + - node -v + - npm -v + script: + - *extract_version + - npm ci --cache .npm --prefer-offline + - npm run build + - tar -czf assets.tar.gz js css + artifacts: + name: "assets-$CI_COMMIT_REF_SLUG" + paths: + - assets.tar.gz + - version.env + expire_in: 7 days + +publish:generic-registry: + stage: publish + image: curlimages/curl:8.10.1 + needs: + - job: build:vendor + artifacts: true + - job: build:frontend + artifacts: true + <<: *rules_default + script: + - | + set -euo pipefail + source version.env + echo "Publishing vendor and assets to Generic Package Registry (version: $PACKAGE_VERSION)" + BASE_URL="$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic" + VENDOR_PKG_NAME="ecloud-accounts-vendor" + ASSETS_PKG_NAME="ecloud-accounts-assets" + echo "Uploading vendor.tar.gz ..." + curl --fail --show-error --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file vendor.tar.gz "$BASE_URL/$VENDOR_PKG_NAME/$PACKAGE_VERSION/vendor.tar.gz" + echo "Uploading assets.tar.gz ..." + curl --fail --show-error --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file assets.tar.gz "$BASE_URL/$ASSETS_PKG_NAME/$PACKAGE_VERSION/assets.tar.gz" + artifacts: + when: always + reports: + dotenv: version.env + stages: - test - build -- GitLab From 5b33434ea35561099c2dff80aedf7b45104c316a Mon Sep 17 00:00:00 2001 From: theronakpatel Date: Wed, 15 Oct 2025 16:53:44 +0530 Subject: [PATCH 03/18] Revert "ci: add GitLab pipeline to build and publish artifacts" This reverts commit ed8c0dc46af33c47ec316448d777eac7e6001349. --- .gitlab-ci.yml | 111 ------------------------------------------------- 1 file changed, 111 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f50aaf3..8a7949e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,114 +1,3 @@ -stages: - - build - - publish - -default: - interruptible: true - before_script: - - 'echo "Running on $(uname -a)"' - -.rules_default: &rules_default - rules: - - if: '$CI_COMMIT_TAG' - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - - when: manual - allow_failure: true - -.extract_version: &extract_version - - | - set -euo pipefail - echo "Deriving package version from appinfo/info.xml ..." - RAW_VERSION=$(xmllint --xpath 'string(/info/version)' appinfo/info.xml 2>/dev/null || true) - if [ -z "${RAW_VERSION:-}" ]; then - RAW_VERSION=$(grep -oP '\K[^<]+' appinfo/info.xml | head -n1 || true) - fi - if [ -z "${RAW_VERSION:-}" ]; then - echo "Could not extract version from appinfo/info.xml" >&2 - exit 1 - fi - RAW_VERSION=${RAW_VERSION#v} - if [ -n "${CI_COMMIT_TAG:-}" ]; then - PACKAGE_VERSION="${CI_COMMIT_TAG#v}" - else - # Append short SHA to make version unique for non-tag builds - PACKAGE_VERSION="${RAW_VERSION}-${CI_COMMIT_SHORT_SHA}" - fi - echo "PACKAGE_VERSION=${PACKAGE_VERSION}" | tee -a version.env - -variables: - NODE_ENV: production - npm_config_ci: 'true' - -cache: - paths: - - .npm/ - - vendor/cache/ - -build:vendor: - stage: build - image: composer:2 - needs: [] - <<: *rules_default - before_script: - - composer --version - - php -v - script: - - *extract_version - - composer install --no-dev --prefer-dist --no-progress --optimize-autoloader --classmap-authoritative - - tar -czf vendor.tar.gz vendor - artifacts: - name: "vendor-$CI_COMMIT_REF_SLUG" - paths: - - vendor.tar.gz - - version.env - expire_in: 7 days - -build:frontend: - stage: build - image: node:16-bullseye - needs: [] - <<: *rules_default - before_script: - - node -v - - npm -v - script: - - *extract_version - - npm ci --cache .npm --prefer-offline - - npm run build - - tar -czf assets.tar.gz js css - artifacts: - name: "assets-$CI_COMMIT_REF_SLUG" - paths: - - assets.tar.gz - - version.env - expire_in: 7 days - -publish:generic-registry: - stage: publish - image: curlimages/curl:8.10.1 - needs: - - job: build:vendor - artifacts: true - - job: build:frontend - artifacts: true - <<: *rules_default - script: - - | - set -euo pipefail - source version.env - echo "Publishing vendor and assets to Generic Package Registry (version: $PACKAGE_VERSION)" - BASE_URL="$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic" - VENDOR_PKG_NAME="ecloud-accounts-vendor" - ASSETS_PKG_NAME="ecloud-accounts-assets" - echo "Uploading vendor.tar.gz ..." - curl --fail --show-error --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file vendor.tar.gz "$BASE_URL/$VENDOR_PKG_NAME/$PACKAGE_VERSION/vendor.tar.gz" - echo "Uploading assets.tar.gz ..." - curl --fail --show-error --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file assets.tar.gz "$BASE_URL/$ASSETS_PKG_NAME/$PACKAGE_VERSION/assets.tar.gz" - artifacts: - when: always - reports: - dotenv: version.env - stages: - test - build -- GitLab From 4921ac870b0ff2ce58fe5307eb3454be2150713e Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 16 Oct 2025 00:36:05 +0530 Subject: [PATCH 04/18] updated gitlab.yml for publish --- .gitlab-ci.yml | 7 ++++++- package.json | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a7949e3..779ced68 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ stages: - deploy variables: - TO_PACKAGE: 'appinfo l10n lib templates js img css' + APP_NAME: eCloud include: - project: "e/infra/ecloud/nextcloud-apps/ci-templates" ref: main @@ -38,6 +38,11 @@ build-vendor: - cp -a vendor dist/${APP_NAME} - find dist/${APP_NAME} -type d -exec chmod 755 {} \; - find dist/${APP_NAME} -type f -exec chmod 644 {} \; + - cp package.json dist/${APP_NAME}/ + - cd dist/${APP_NAME} + - npm config set @ecloud:registry ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/npm/ + - npm config set //${CI_SERVER_HOST}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/:_authToken ${CI_JOB_TOKEN} + - npm publish artifacts: paths: - dist/ diff --git a/package.json b/package.json index 58337c9e..5f71218f 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,24 @@ { - "name": "ecloud-accounts", + "name": "@ecloud/ecloud-accounts", "version": "8.0.0", "description": "App for ecloud account management.", "repository": { "type": "git", "url": "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-accounts" }, - "private": true, + "publishConfig": { + "@ecloud:registry": "https://gitlab.e.foundation/api/v4/projects/__PROJECT_ID__/packages/npm/" + }, + "files": [ + "appinfo", + "l10n", + "lib", + "templates", + "js", + "img", + "css", + "vendor" + ], "scripts": { "build-scss": "sass scss:css --style compressed --no-source-map", "build": "npm run build-scss && NODE_ENV=production webpack --progress", -- GitLab From 3c3b958307e165118599fd6aaab87ae208f74dc5 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 16 Oct 2025 00:41:25 +0530 Subject: [PATCH 05/18] added apk add --no-cache nodejs npm to the before_script section --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 779ced68..a8727925 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,6 +34,7 @@ build-vendor: needs: ["build-frontend"] before_script: - composer install --no-dev + - apk add --no-cache nodejs npm script: - cp -a vendor dist/${APP_NAME} - find dist/${APP_NAME} -type d -exec chmod 755 {} \; -- GitLab From 6e95228e691a54b207a7a7de6652ade7ef9fa8e1 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 16 Oct 2025 00:45:36 +0530 Subject: [PATCH 06/18] add project id --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8727925..d88f3a42 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,6 +41,7 @@ build-vendor: - find dist/${APP_NAME} -type f -exec chmod 644 {} \; - cp package.json dist/${APP_NAME}/ - cd dist/${APP_NAME} + - sed -i "s/__PROJECT_ID__/${CI_PROJECT_ID}/g" package.json - npm config set @ecloud:registry ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/npm/ - npm config set //${CI_SERVER_HOST}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/:_authToken ${CI_JOB_TOKEN} - npm publish -- GitLab From 292937f8fa7ef2c5969d73d157d557fba8ff2c44 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 16 Oct 2025 00:51:39 +0530 Subject: [PATCH 07/18] add project id --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d88f3a42..4e963751 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,8 @@ build-vendor: - cp package.json dist/${APP_NAME}/ - cd dist/${APP_NAME} - sed -i "s/__PROJECT_ID__/${CI_PROJECT_ID}/g" package.json - - npm config set @ecloud:registry ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/npm/ + - sed -i "s/@ecloud\/ecloud-accounts/ecloud-accounts/g" package.json + - npm config set registry ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/npm/ - npm config set //${CI_SERVER_HOST}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/:_authToken ${CI_JOB_TOKEN} - npm publish artifacts: -- GitLab From e66177a30a215e58456a0bd5b31c712ffaba92dd Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 16 Oct 2025 10:07:10 +0530 Subject: [PATCH 08/18] for development branch use development branch name for packagr registry --- .gitlab-ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e963751..3d49c7bb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,6 +43,15 @@ build-vendor: - cd dist/${APP_NAME} - sed -i "s/__PROJECT_ID__/${CI_PROJECT_ID}/g" package.json - sed -i "s/@ecloud\/ecloud-accounts/ecloud-accounts/g" package.json + - | + if [[ "$CI_COMMIT_REF_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + # Use version from package.json for release tags (v8.0.0 -> 8.0.0) + VERSION=$(echo $CI_COMMIT_REF_NAME | sed 's/^v//') + else + # Use branch name for development branches + VERSION=$(echo $CI_COMMIT_REF_NAME | sed 's/\//-/g') + fi + sed -i "s/\"version\": \"8.0.0\"/\"version\": \"$VERSION\"/g" package.json - npm config set registry ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/npm/ - npm config set //${CI_SERVER_HOST}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/:_authToken ${CI_JOB_TOKEN} - npm publish -- GitLab From a0881ec2c8740edd6eb6d408c56400d2fac2a8ce Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 16 Oct 2025 10:12:04 +0530 Subject: [PATCH 09/18] tag name fix --- .gitlab-ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d49c7bb..86b94fa3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,12 +44,15 @@ build-vendor: - sed -i "s/__PROJECT_ID__/${CI_PROJECT_ID}/g" package.json - sed -i "s/@ecloud\/ecloud-accounts/ecloud-accounts/g" package.json - | + # Extract base version from info.xml + BASE_VERSION=$(grep -oP '(?<=)[^<]+' appinfo/info.xml) if [[ "$CI_COMMIT_REF_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then - # Use version from package.json for release tags (v8.0.0 -> 8.0.0) + # Use version from tag for release tags (v8.0.0 -> 8.0.0) VERSION=$(echo $CI_COMMIT_REF_NAME | sed 's/^v//') else - # Use branch name for development branches - VERSION=$(echo $CI_COMMIT_REF_NAME | sed 's/\//-/g') + # Use branch name with base version for development branches (dev/package-registry -> dev-package-registry-8.0.0) + BRANCH_NAME=$(echo $CI_COMMIT_REF_NAME | sed 's/\//-/g') + VERSION="$BRANCH_NAME-$BASE_VERSION" fi sed -i "s/\"version\": \"8.0.0\"/\"version\": \"$VERSION\"/g" package.json - npm config set registry ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/npm/ -- GitLab From b90ff800a9e1d53d019ceec12adf21ee5a35cb74 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 16 Oct 2025 10:18:48 +0530 Subject: [PATCH 10/18] grep fix --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 86b94fa3..7fff6744 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,7 @@ build-vendor: - sed -i "s/@ecloud\/ecloud-accounts/ecloud-accounts/g" package.json - | # Extract base version from info.xml - BASE_VERSION=$(grep -oP '(?<=)[^<]+' appinfo/info.xml) + BASE_VERSION=$(grep '' appinfo/info.xml | sed 's/.*\([^<]*\)<\/version>.*/\1/') if [[ "$CI_COMMIT_REF_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then # Use version from tag for release tags (v8.0.0 -> 8.0.0) VERSION=$(echo $CI_COMMIT_REF_NAME | sed 's/^v//') -- GitLab From 7e6d29c604c0695e055d88cc714c751304909669 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 16 Oct 2025 10:29:28 +0530 Subject: [PATCH 11/18] fix version --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7fff6744..0c4fddb1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,9 +50,9 @@ build-vendor: # Use version from tag for release tags (v8.0.0 -> 8.0.0) VERSION=$(echo $CI_COMMIT_REF_NAME | sed 's/^v//') else - # Use branch name with base version for development branches (dev/package-registry -> dev-package-registry-8.0.0) + # Use base version with branch name as pre-release identifier (dev/package-registry -> 12.0.1-dev-package-registry) BRANCH_NAME=$(echo $CI_COMMIT_REF_NAME | sed 's/\//-/g') - VERSION="$BRANCH_NAME-$BASE_VERSION" + VERSION="$BASE_VERSION-$BRANCH_NAME" fi sed -i "s/\"version\": \"8.0.0\"/\"version\": \"$VERSION\"/g" package.json - npm config set registry ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/npm/ -- GitLab From 8a68cacf46447445cc5de5a66cc002a1958f62dc Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 16 Oct 2025 10:41:18 +0530 Subject: [PATCH 12/18] fix tar --- .gitlab-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c4fddb1..ff2172e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,10 +54,11 @@ build-vendor: BRANCH_NAME=$(echo $CI_COMMIT_REF_NAME | sed 's/\//-/g') VERSION="$BASE_VERSION-$BRANCH_NAME" fi - sed -i "s/\"version\": \"8.0.0\"/\"version\": \"$VERSION\"/g" package.json - - npm config set registry ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/npm/ - - npm config set //${CI_SERVER_HOST}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/:_authToken ${CI_JOB_TOKEN} - - npm publish + # Create tar.gz package + cd .. + tar -czf ecloud-accounts-${VERSION}.tar.gz -C dist ${APP_NAME} + # Upload to GitLab Package Registry + curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ecloud-accounts-${VERSION}.tar.gz "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/ecloud-accounts/${VERSION}/ecloud-accounts-${VERSION}.tar.gz" artifacts: paths: - dist/ -- GitLab From 2fd4311987b9eea6febe67b65a8a3a99ff9d13c3 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 16 Oct 2025 10:46:25 +0530 Subject: [PATCH 13/18] fix path --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff2172e7..53fcdd29 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,7 +55,7 @@ build-vendor: VERSION="$BASE_VERSION-$BRANCH_NAME" fi # Create tar.gz package - cd .. + cd ../.. tar -czf ecloud-accounts-${VERSION}.tar.gz -C dist ${APP_NAME} # Upload to GitLab Package Registry curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ecloud-accounts-${VERSION}.tar.gz "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/ecloud-accounts/${VERSION}/ecloud-accounts-${VERSION}.tar.gz" -- GitLab From 2382f9ce68c1d90333b80c4551aefe59b835e6b7 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 16 Oct 2025 10:53:37 +0530 Subject: [PATCH 14/18] fix App Name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 53fcdd29..147d86f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ stages: - deploy variables: - APP_NAME: eCloud + APP_NAME: ecloud-accounts include: - project: "e/infra/ecloud/nextcloud-apps/ci-templates" ref: main -- GitLab From c26c921fc264e31a0b3cebaf50288ee9363a02eb Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 16 Oct 2025 11:17:37 +0530 Subject: [PATCH 15/18] add TO_PACKAGE: 'appinfo l10n lib templates js img css' --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 147d86f1..59dd0b31 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ stages: variables: APP_NAME: ecloud-accounts + TO_PACKAGE: 'appinfo l10n lib templates js img css' include: - project: "e/infra/ecloud/nextcloud-apps/ci-templates" ref: main -- GitLab From b7b209640cd892e5b703925d540c8bbf4348768c Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 16 Oct 2025 11:20:32 +0530 Subject: [PATCH 16/18] fix package.json --- .gitlab-ci.yml | 5 ----- package.json | 16 ++-------------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59dd0b31..82b702e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,10 +40,6 @@ build-vendor: - cp -a vendor dist/${APP_NAME} - find dist/${APP_NAME} -type d -exec chmod 755 {} \; - find dist/${APP_NAME} -type f -exec chmod 644 {} \; - - cp package.json dist/${APP_NAME}/ - - cd dist/${APP_NAME} - - sed -i "s/__PROJECT_ID__/${CI_PROJECT_ID}/g" package.json - - sed -i "s/@ecloud\/ecloud-accounts/ecloud-accounts/g" package.json - | # Extract base version from info.xml BASE_VERSION=$(grep '' appinfo/info.xml | sed 's/.*\([^<]*\)<\/version>.*/\1/') @@ -56,7 +52,6 @@ build-vendor: VERSION="$BASE_VERSION-$BRANCH_NAME" fi # Create tar.gz package - cd ../.. tar -czf ecloud-accounts-${VERSION}.tar.gz -C dist ${APP_NAME} # Upload to GitLab Package Registry curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ecloud-accounts-${VERSION}.tar.gz "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/ecloud-accounts/${VERSION}/ecloud-accounts-${VERSION}.tar.gz" diff --git a/package.json b/package.json index 5f71218f..58337c9e 100644 --- a/package.json +++ b/package.json @@ -1,24 +1,12 @@ { - "name": "@ecloud/ecloud-accounts", + "name": "ecloud-accounts", "version": "8.0.0", "description": "App for ecloud account management.", "repository": { "type": "git", "url": "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/ecloud-accounts" }, - "publishConfig": { - "@ecloud:registry": "https://gitlab.e.foundation/api/v4/projects/__PROJECT_ID__/packages/npm/" - }, - "files": [ - "appinfo", - "l10n", - "lib", - "templates", - "js", - "img", - "css", - "vendor" - ], + "private": true, "scripts": { "build-scss": "sass scss:css --style compressed --no-source-map", "build": "npm run build-scss && NODE_ENV=production webpack --progress", -- GitLab From a010691c5af58f5a7107342e1348516e9dc11361 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Thu, 16 Oct 2025 15:42:56 +0530 Subject: [PATCH 17/18] applied suggestion and used test branch for publish --- .gitlab-ci.yml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 82b702e3..d66f622e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ include: ref: main file: "populate-code-climate-default-config.yml" - project: "e/infra/ecloud/nextcloud-apps/ci-templates" - ref: main + ref: dev/test-publish file: "nc-publish-app.yml" build-vendor: @@ -35,26 +35,10 @@ build-vendor: needs: ["build-frontend"] before_script: - composer install --no-dev - - apk add --no-cache nodejs npm script: - cp -a vendor dist/${APP_NAME} - find dist/${APP_NAME} -type d -exec chmod 755 {} \; - find dist/${APP_NAME} -type f -exec chmod 644 {} \; - - | - # Extract base version from info.xml - BASE_VERSION=$(grep '' appinfo/info.xml | sed 's/.*\([^<]*\)<\/version>.*/\1/') - if [[ "$CI_COMMIT_REF_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then - # Use version from tag for release tags (v8.0.0 -> 8.0.0) - VERSION=$(echo $CI_COMMIT_REF_NAME | sed 's/^v//') - else - # Use base version with branch name as pre-release identifier (dev/package-registry -> 12.0.1-dev-package-registry) - BRANCH_NAME=$(echo $CI_COMMIT_REF_NAME | sed 's/\//-/g') - VERSION="$BASE_VERSION-$BRANCH_NAME" - fi - # Create tar.gz package - tar -czf ecloud-accounts-${VERSION}.tar.gz -C dist ${APP_NAME} - # Upload to GitLab Package Registry - curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ecloud-accounts-${VERSION}.tar.gz "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/ecloud-accounts/${VERSION}/ecloud-accounts-${VERSION}.tar.gz" artifacts: paths: - dist/ -- GitLab From 2a8f04b9c4c980682021938f5b9937bad85d9533 Mon Sep 17 00:00:00 2001 From: Avinash Gusain Date: Fri, 17 Oct 2025 22:16:03 +0530 Subject: [PATCH 18/18] added main back instead of test branch --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d66f622e..7f9f501f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ include: ref: main file: "populate-code-climate-default-config.yml" - project: "e/infra/ecloud/nextcloud-apps/ci-templates" - ref: dev/test-publish + ref: main file: "nc-publish-app.yml" build-vendor: -- GitLab