From 2b98aabe504c86b58ec21ca2e91d5c13d35f79d4 Mon Sep 17 00:00:00 2001 From: "Robert St. John" <1292665+restjohn@users.noreply.github.com> Date: Wed, 29 Jul 2026 09:35:35 -0600 Subject: [PATCH 1/2] fix: add repository entries to web plugin package descriptors which npm requires for trusted publishing from ci --- plugins/arcgis/web-app/projects/main/package.json | 4 ++++ plugins/sftp/web/projects/main/package.json | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/plugins/arcgis/web-app/projects/main/package.json b/plugins/arcgis/web-app/projects/main/package.json index 0a8ef885d..dfc991647 100644 --- a/plugins/arcgis/web-app/projects/main/package.json +++ b/plugins/arcgis/web-app/projects/main/package.json @@ -1,6 +1,10 @@ { "name": "@ngageoint/mage.arcgis.web-app", "version": "1.0.0-beta.3", + "repository": { + "type": "git", + "url": "https://github.com/ngageoint/mage-server.git" + }, "peerDependencies": { "@ngageoint/mage.web-app": "^6.6.0 || ^6.6.0-beta.1" }, diff --git a/plugins/sftp/web/projects/main/package.json b/plugins/sftp/web/projects/main/package.json index 28f9023cb..aa3686fdb 100644 --- a/plugins/sftp/web/projects/main/package.json +++ b/plugins/sftp/web/projects/main/package.json @@ -1,6 +1,10 @@ { "name": "@ngageoint/mage.sftp.web", "version": "1.0.0-beta.5", + "repository": { + "type": "git", + "url": "https://github.com/ngageoint/mage-server.git" + }, "peerDependencies": { "@ngageoint/mage.web-app": "^6.6.0 || ^6.6.0-beta.1" }, From 8f65c782055a0980abc3cb2cc0fa26071d524bb5 Mon Sep 17 00:00:00 2001 From: "Robert St. John" <1292665+restjohn@users.noreply.github.com> Date: Wed, 29 Jul 2026 10:00:14 -0600 Subject: [PATCH 2/2] fix(ci): separate package publishing steps to add fault tolerance when publishing fails for external configuration reasons and allows retrying the job --- .github/workflows/release.core.yaml | 11 ++++++++++- .github/workflows/release.plugin.arcgis.yaml | 6 +++++- .github/workflows/release.plugin.sftp.yaml | 6 +++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.core.yaml b/.github/workflows/release.core.yaml index 354712d8f..daa86bfc7 100644 --- a/.github/workflows/release.core.yaml +++ b/.github/workflows/release.core.yaml @@ -160,10 +160,19 @@ jobs: eval "npm publish --dry-run --access public ${dist_tag_switch} $(ls -1 ./scratch/ngageoint-mage.service-*.tgz)" eval "npm publish --dry-run --access public ${dist_tag_switch} $(ls -1 ./scratch/ngageoint-mage.web-app-*.tgz)" eval "npm publish --dry-run --access public ${dist_tag_switch} $(ls -1 ./scratch/ngageoint-mage.web-core-lib-*.tgz)" - - name: publish + - name: publish service package if: ${{ ! inputs.is_draft }} + continue-on-error: true run: | eval "npm publish --access public ${dist_tag_switch} $(ls -1 ./scratch/ngageoint-mage.service-*.tgz)" + - name: publish web-app package + if: ${{ ! inputs.is_draft }} + continue-on-error: true + run: | eval "npm publish --access public ${dist_tag_switch} $(ls -1 ./scratch/ngageoint-mage.web-app-*.tgz)" + - name: publish web-core-lib package + if: ${{ ! inputs.is_draft }} + continue-on-error: true + run: | eval "npm publish --access public ${dist_tag_switch} $(ls -1 ./scratch/ngageoint-mage.web-core-lib-*.tgz)" diff --git a/.github/workflows/release.plugin.arcgis.yaml b/.github/workflows/release.plugin.arcgis.yaml index 77fb01b03..0508f2f76 100644 --- a/.github/workflows/release.plugin.arcgis.yaml +++ b/.github/workflows/release.plugin.arcgis.yaml @@ -95,7 +95,11 @@ jobs: run: | eval "npm publish --dry-run --access public ${dist_tag_switch} $(ls -1 ./scratch/ngageoint-mage.arcgis.service-*.tgz)" eval "npm publish --dry-run --access public ${dist_tag_switch} $(ls -1 ./scratch/ngageoint-mage.arcgis.web-app-*.tgz)" - - name: publish + - name: publish service package + continue-on-error: true run: | eval "npm publish --access public ${dist_tag_switch} $(ls -1 ./scratch/ngageoint-mage.arcgis.service-*.tgz)" + - name: publish web-app package + continue-on-error: true + run: | eval "npm publish --access public ${dist_tag_switch} $(ls -1 ./scratch/ngageoint-mage.arcgis.web-app-*.tgz)" diff --git a/.github/workflows/release.plugin.sftp.yaml b/.github/workflows/release.plugin.sftp.yaml index 57636c6f1..b6557ee0f 100644 --- a/.github/workflows/release.plugin.sftp.yaml +++ b/.github/workflows/release.plugin.sftp.yaml @@ -96,7 +96,11 @@ jobs: run: | eval "npm publish --dry-run --access public ${dist_tag_switch} $(ls -1 ./scratch/ngageoint-mage.sftp.service-*.tgz)" eval "npm publish --dry-run --access public ${dist_tag_switch} $(ls -1 ./scratch/ngageoint-mage.sftp.web-*.tgz)" - - name: publish + - name: publish service package + continue-on-error: true run: | eval "npm publish --access public ${dist_tag_switch} $(ls -1 ./scratch/ngageoint-mage.sftp.service-*.tgz)" + - name: publish web-app package + continue-on-error: true + run: | eval "npm publish --access public ${dist_tag_switch} $(ls -1 ./scratch/ngageoint-mage.sftp.web-*.tgz)" \ No newline at end of file