Skip to content
Merged
Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
0d27e9b
initial fixes
ryanslatten Feb 18, 2025
eb60b57
pr comment fix
ryanslatten Feb 18, 2025
409afda
update github action version
ryanslatten Feb 25, 2025
5b13a32
fix more action stuff
ryanslatten Feb 25, 2025
0e622ee
Revert "fix more action stuff"
ryanslatten Feb 25, 2025
bac306c
Revert "update github action version"
ryanslatten Feb 25, 2025
990d4b3
Merge branch 'develop' of https://github.com/ngageoint/mage-server in…
ryanslatten Feb 26, 2025
477fe1c
test commit
ryanslatten Feb 26, 2025
ef8c358
package json
ryanslatten Feb 26, 2025
fa3b399
add linux
ryanslatten Feb 26, 2025
c434fe1
add link to arcgis
ryanslatten Feb 26, 2025
eb794fb
add link
ryanslatten Feb 26, 2025
4e342e7
update os
ryanslatten Feb 26, 2025
8d6c439
test
ryanslatten Feb 26, 2025
74cdd07
test
ryanslatten Feb 26, 2025
8822714
test
ryanslatten Feb 26, 2025
c600e3d
test
ryanslatten Feb 26, 2025
444adc1
test
ryanslatten Feb 26, 2025
e5c3ffd
test
ryanslatten Feb 26, 2025
fb26583
test
ryanslatten Feb 26, 2025
cb56e63
Merge pull request #245 from ngageoint/filter-options
ryanslatten Feb 26, 2025
4f0d64d
store
ryanslatten Feb 27, 2025
c258964
test
ryanslatten Feb 27, 2025
1a8c7fc
test
ryanslatten Feb 27, 2025
7bc6438
test
ryanslatten Feb 27, 2025
711d712
fix arcgis service
ryanslatten Feb 27, 2025
820bab3
test
ryanslatten Feb 27, 2025
be15a9e
test
ryanslatten Feb 27, 2025
d3e2846
test
ryanslatten Feb 27, 2025
feb04b1
test
ryanslatten Mar 4, 2025
b0e0f37
test
ryanslatten Mar 4, 2025
9294f2a
test
ryanslatten Mar 4, 2025
041917d
test
ryanslatten Mar 4, 2025
a9ddd1e
test
ryanslatten Mar 4, 2025
52a2eeb
test
ryanslatten Mar 4, 2025
ba7ab85
test
ryanslatten Mar 4, 2025
b7ba9b9
test
ryanslatten Mar 4, 2025
746cca8
teat
ryanslatten Mar 4, 2025
28fc550
test
ryanslatten Mar 4, 2025
cc8e6a0
test
ryanslatten Mar 4, 2025
bce2a45
link service
ryanslatten Mar 4, 2025
4f023cd
test
ryanslatten Mar 4, 2025
91add99
test
ryanslatten Mar 4, 2025
1f99cfc
test
ryanslatten Mar 4, 2025
b89ccae
add pull request watching
ryanslatten Mar 4, 2025
f686a62
update package lock
ryanslatten Mar 4, 2025
4d84c3d
update package files for plugins
ryanslatten Mar 6, 2025
53dd12a
test fix
ryanslatten Mar 6, 2025
747dca1
test ci
ryanslatten Mar 7, 2025
93c2832
revert package lock
ryanslatten Mar 7, 2025
d06c35f
revert arcgis change
ryanslatten Mar 7, 2025
5bd6c83
test package lock change
ryanslatten Mar 7, 2025
da994b7
update package lock
ryanslatten Mar 7, 2025
4bebaab
update image test
ryanslatten Mar 7, 2025
31d8ff4
Rebase commit with updated tets
ryanslatten Mar 12, 2025
b47fa0b
Merge branch 'actions-fix' of https://github.com/ngageoint/mage-serve…
ryanslatten Mar 12, 2025
e83cf4b
Rest commits
ryanslatten Mar 12, 2025
55f7570
Merge branch 'actions-fix' of https://github.com/ngageoint/mage-serve…
ryanslatten Mar 12, 2025
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
25 changes: 18 additions & 7 deletions .github/workflows/build_test.arcgis.service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@ name: test and package arcgis service plugin
on:
workflow_dispatch:
workflow_call:
push:
pull_request:
paths:
- .github/workflows/build_test.arcgis.service.yaml
- .github/workflows/config.yaml
- plugins/arcgis/service/**

jobs:

config:
uses: ./.github/workflows/config.yaml

test:
name: test plugin arcgis.service
needs: [ config ]
needs: [config]
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -31,15 +30,21 @@ jobs:
cache: npm
cache-dependency-path: |
plugins/arcgis/service/package-lock.json
- name: build mage service
run: |
cd service
npm ci
npm run build
- name: test with node ${{ matrix.node }}
run: |
cd plugins/arcgis/service
npm ci
npm link ../../../service
npm test

package:
name: package plugin arcgis.service
needs: [ config, test ]
needs: [config, test]
runs-on: ubuntu-latest
steps:
- name: checkout
Expand All @@ -51,15 +56,21 @@ jobs:
cache: npm
cache-dependency-path: |
plugins/arcgis/service/package-lock.json
- name: build
- name: build mage service
run: |
cd service
npm ci
npm run build
- name: build service for plugin
run: |
cd plugins/arcgis/service
npm ci
npm link ../../../service
npm run build
- name: pack
- name: package for plugin
run: npm pack ./plugins/arcgis/service
- name: upload package
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: arcgis.service-artifacts
path: |
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/build_test.arcgis.web-app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@ name: test and package arcgis web plugin
on:
workflow_dispatch:
workflow_call:
push:
pull_request:
paths:
- .github/workflows/build_test.arcgis.web-app.yaml
- .github/workflows/config.yaml
- plugins/arcgis/web-app/**

jobs:

config:
uses: ./.github/workflows/config.yaml

Expand Down Expand Up @@ -42,9 +41,8 @@ jobs:
run: |
npm pack ./plugins/arcgis/web-app/dist/main
- name: upload packages
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: arcgis.web-app-artifacts
path: |
ngageoint-mage.arcgis.web-app-*.tgz

27 changes: 20 additions & 7 deletions .github/workflows/build_test.image.service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@ name: test and package image service plugin
on:
workflow_dispatch:
workflow_call:
push:
pull_request:
paths:
- .github/workflows/build_test.image.service.yaml
- .github/workflows/config.yaml
- plugins/image/service/**

jobs:

config:
uses: ./.github/workflows/config.yaml

test:
name: test plugin image.service
needs: [ config ]
needs: [config]
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -31,15 +30,22 @@ jobs:
cache: npm
cache-dependency-path: |
plugins/image/service/package-lock.json
- name: build mage service
run: |
cd service
npm ci
npm run build
- name: test with node ${{ matrix.node }}
run: |
cd plugins/image/service
npm ci
npm install --force
npm install --os=linux --cpu=x64 sharp
npm link ../../../service
npm test

package:
name: package plugin image.service
needs: [ config, test ]
needs: [config, test]
runs-on: ubuntu-latest
steps:
- name: checkout
Expand All @@ -51,15 +57,22 @@ jobs:
cache: npm
cache-dependency-path: |
plugins/image/service/package-lock.json
- name: build mage service
run: |
cd service
npm ci
npm run build
- name: build
run: |
cd plugins/image/service
npm ci
npm install --force
npm install --os=linux --cpu=x64 sharp
npm link ../../../service
npm run build
- name: pack
run: npm pack ./plugins/image/service
- name: upload package
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: image.service-artifacts
path: |
Expand Down
23 changes: 17 additions & 6 deletions .github/workflows/build_test.nga-msi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@ name: test and package nga-msi plugin
on:
workflow_dispatch:
workflow_call:
push:
pull_request:
paths:
- .github/workflows/build_test.nga-msi.yaml
- .github/workflows/config.yaml
- plugins/nga-msi/**

jobs:

config:
uses: ./.github/workflows/config.yaml

test:
name: test plugin nga-msi
needs: [ config ]
needs: [config]
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -31,15 +30,21 @@ jobs:
cache: npm
cache-dependency-path: |
plugins/nga-msi/package-lock.json
- name: build mage service
run: |
cd service
npm ci
npm run build
- name: test with node ${{ matrix.node }}
run: |
cd plugins/nga-msi
npm ci
npm link ../../service
npm test

package:
name: package plugin nga-msi
needs: [ config, test ]
needs: [config, test]
runs-on: ubuntu-latest
steps:
- name: checkout
Expand All @@ -51,16 +56,22 @@ jobs:
cache: npm
cache-dependency-path: |
plugins/nga-msi/package-lock.json
- name: build mage service
run: |
cd service
npm ci
npm run build
- name: build
run: |
cd plugins/nga-msi
npm ci
npm link ../../service
npm run build
- name: pack
run: npm pack ./plugins/nga-msi
- name: upload package
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: nga-msi-artifacts
path: |
ngageoint-mage.*.tgz
ngageoint-mage.*.tgz
19 changes: 11 additions & 8 deletions .github/workflows/build_test.service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: build and test service
on:
workflow_dispatch:
workflow_call:
push:
pull_request:
paths:
- .github/workflows/build_test.service.yaml
- .github/workflows/config.yaml
Expand All @@ -15,7 +15,7 @@ jobs:
build:
name: build mage service
needs: config
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: install system libs
run: |
Expand All @@ -32,20 +32,23 @@ jobs:
run: |
cd service
npm ci
npm run build
- name: run tests
run: |
cd service
npm test
- name: package
run: npm pack ./service
- name: upload package
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: mage.service-artifacts
path: |
ngageoint-mage.service-*.tgz

test:
name: test mage service
needs: [ config, build ]
runs-on: ubuntu-latest
needs: [config, build]
runs-on: ubuntu-22.04
strategy:
matrix:
node: ${{ fromJSON(needs.config.outputs.node_versions-all-json) }}
Expand All @@ -64,7 +67,7 @@ jobs:
cd service
npm ci service
- name: download service package
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: mage.service-artifacts
- name: extract service lib
Expand All @@ -76,4 +79,4 @@ jobs:
run: |
cd service
npm run ci:test
# TODO: restore coveralls test coverage report - see buildAndTest.yml
# TODO: restore coveralls test coverage report - see buildAndTest.yml
6 changes: 3 additions & 3 deletions .github/workflows/build_test.web-app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: build and test web-app
on:
workflow_dispatch:
workflow_call:
push:
pull_request:
paths:
- .github/workflows/build_test.web-app.yaml
- .github/workflows/config.yaml
Expand Down Expand Up @@ -41,8 +41,8 @@ jobs:
npm pack ./web-app/dist/core-lib
npm pack ./web-app/dist
- name: upload packages
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: mage.web-app-artifacts
path: |
ngageoint-mage.*.tgz
ngageoint-mage.*.tgz
15 changes: 7 additions & 8 deletions .github/workflows/release.arcgis_plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@ on:
# release:

jobs:

config:
uses: ./.github/workflows/config.yaml

check_release_version:
needs: [ config ]
needs: [config]
runs-on: ubuntu-latest
steps:
- name: checkout
Expand All @@ -41,16 +40,16 @@ jobs:
[[ $(json version < ./plugins/arcgis/web-app/package.json) = ${{ inputs.version }} ]] || exit 1

build_and_test-service:
needs: [ check_release_version ]
needs: [check_release_version]
uses: ./.github/workflows/build_test.arcgis.service.yaml

build_and_test-web-app:
needs: [ check_release_version ]
needs: [check_release_version]
uses: ./.github/workflows/build_test.arcgis.web-app.yaml

publish_packages:
name: publish packages
needs: [ config, build_and_test-service ]
name: publish packages
needs: [config, build_and_test-service]
runs-on: ubuntu-latest
steps:
- name: setup node
Expand All @@ -60,11 +59,11 @@ jobs:
- name: install json util
run: npm i -g json
- name: download service packages
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: arcgis.service-artifacts
- name: download web-app packages
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: arcgis.web-app-artifacts
- name: publish to package registry
Expand Down
Loading