Skip to content

Commit 0e622ee

Browse files
committed
Revert "fix more action stuff"
This reverts commit 5b13a32.
1 parent 5b13a32 commit 0e622ee

File tree

7 files changed

+34
-36
lines changed

7 files changed

+34
-36
lines changed

.github/workflows/build_test.service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
cd service
6565
npm ci service
6666
- name: download service package
67-
uses: actions/download-artifact@v4
67+
uses: actions/download-artifact@v3
6868
with:
6969
name: mage.service-artifacts
7070
- name: extract service lib

.github/workflows/release.arcgis_plugin.yaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ on:
1717
# release:
1818

1919
jobs:
20+
2021
config:
2122
uses: ./.github/workflows/config.yaml
2223

2324
check_release_version:
24-
needs: [config]
25+
needs: [ config ]
2526
runs-on: ubuntu-latest
2627
steps:
2728
- name: checkout
@@ -40,16 +41,16 @@ jobs:
4041
[[ $(json version < ./plugins/arcgis/web-app/package.json) = ${{ inputs.version }} ]] || exit 1
4142
4243
build_and_test-service:
43-
needs: [check_release_version]
44+
needs: [ check_release_version ]
4445
uses: ./.github/workflows/build_test.arcgis.service.yaml
4546

4647
build_and_test-web-app:
47-
needs: [check_release_version]
48+
needs: [ check_release_version ]
4849
uses: ./.github/workflows/build_test.arcgis.web-app.yaml
4950

5051
publish_packages:
51-
name: publish packages
52-
needs: [config, build_and_test-service]
52+
name: publish packages
53+
needs: [ config, build_and_test-service ]
5354
runs-on: ubuntu-latest
5455
steps:
5556
- name: setup node
@@ -59,11 +60,11 @@ jobs:
5960
- name: install json util
6061
run: npm i -g json
6162
- name: download service packages
62-
uses: actions/download-artifact@v4
63+
uses: actions/download-artifact@v3
6364
with:
6465
name: arcgis.service-artifacts
6566
- name: download web-app packages
66-
uses: actions/download-artifact@v4
67+
uses: actions/download-artifact@v3
6768
with:
6869
name: arcgis.web-app-artifacts
6970
- name: publish to package registry

.github/workflows/release.image_plugin.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ on:
1717
# release:
1818

1919
jobs:
20+
2021
config:
2122
uses: ./.github/workflows/config.yaml
2223

2324
check_release_version:
24-
needs: [config]
25+
needs: [ config ]
2526
runs-on: ubuntu-latest
2627
steps:
2728
- name: checkout
@@ -40,16 +41,16 @@ jobs:
4041
# [[ $(json version < ./web-app/package.json) = ${{ inputs.version }} ]] || exit 1
4142

4243
build_and_test-service:
43-
needs: [check_release_version]
44+
needs: [ check_release_version ]
4445
uses: ./.github/workflows/build_test.image.service.yaml
4546

4647
# build_and_test-web-app:
4748
# needs: [ check_release_version ]
4849
# uses: ./.github/workflows/build_test.image.web-app.yaml
4950

5051
publish_packages:
51-
name: publish packages
52-
needs: [config, build_and_test-service]
52+
name: publish packages
53+
needs: [ config, build_and_test-service ]
5354
runs-on: ubuntu-latest
5455
steps:
5556
- name: setup node
@@ -59,7 +60,7 @@ jobs:
5960
- name: install json util
6061
run: npm i -g json
6162
- name: download service packages
62-
uses: actions/download-artifact@v4
63+
uses: actions/download-artifact@v3
6364
with:
6465
name: image.service-artifacts
6566
- name: publish to package registry

.github/workflows/release.nga-msi_plugin.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ on:
1717
# release:
1818

1919
jobs:
20+
2021
config:
2122
uses: ./.github/workflows/config.yaml
2223

2324
check_release_version:
24-
needs: [config]
25+
needs: [ config ]
2526
runs-on: ubuntu-latest
2627
steps:
2728
- name: checkout
@@ -37,12 +38,12 @@ jobs:
3738
[[ $(json version < ./plugins/nga-msi/package.json) = ${{ inputs.version }} ]] || exit 1
3839
3940
build_and_test-service:
40-
needs: [check_release_version]
41+
needs: [ check_release_version ]
4142
uses: ./.github/workflows/build_test.nga-msi.yaml
4243

4344
publish_packages:
44-
name: publish packages
45-
needs: [config, build_and_test-service]
45+
name: publish packages
46+
needs: [ config, build_and_test-service ]
4647
runs-on: ubuntu-latest
4748
steps:
4849
- name: setup node
@@ -52,7 +53,7 @@ jobs:
5253
- name: install json util
5354
run: npm i -g json
5455
- name: download service packages
55-
uses: actions/download-artifact@v4
56+
uses: actions/download-artifact@v3
5657
with:
5758
name: nga-msi-artifacts
5859
- name: publish to package registry

.github/workflows/release.yaml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@ on:
2727
# release:
2828

2929
jobs:
30+
3031
config:
3132
uses: ./.github/workflows/config.yaml
3233

3334
check_release_version:
34-
needs: [config]
35+
needs: [ config ]
3536
runs-on: ubuntu-latest
3637
steps:
3738
- name: checkout
@@ -56,16 +57,16 @@ jobs:
5657
[[ $(json version < ./web-app/projects/core-lib/package.json) = ${{ inputs.version }} ]] || exit 1
5758
5859
build_and_test-service:
59-
needs: [check_release_version]
60+
needs: [ check_release_version ]
6061
uses: ./.github/workflows/build_test.service.yaml
6162

6263
build_and_test-web-app:
63-
needs: [check_release_version]
64+
needs: [ check_release_version ]
6465
uses: ./.github/workflows/build_test.web-app.yaml
6566

6667
create_release:
6768
name: create release
68-
needs: [config, build_and_test-service, build_and_test-web-app]
69+
needs: [ config, build_and_test-service, build_and_test-web-app ]
6970
runs-on: ubuntu-latest
7071
steps:
7172
- name: setup node
@@ -75,11 +76,11 @@ jobs:
7576
- name: install json util
7677
run: npm i -g json
7778
- name: download service artifacts
78-
uses: actions/download-artifact@v4
79+
uses: actions/download-artifact@v3
7980
with:
8081
name: mage.service-artifacts
8182
- name: download web-app artifacts
82-
uses: actions/download-artifact@v4
83+
uses: actions/download-artifact@v3
8384
with:
8485
name: mage.web-app-artifacts
8586
- name: generate instance package.json
@@ -107,8 +108,8 @@ jobs:
107108
ngageoint-mage.*.tgz
108109
109110
publish_packages:
110-
name: publish packages
111-
needs: [config, create_release]
111+
name: publish packages
112+
needs: [ config, create_release ]
112113
runs-on: ubuntu-latest
113114
steps:
114115
- name: setup node
@@ -118,11 +119,11 @@ jobs:
118119
- name: install json util
119120
run: npm i -g json
120121
- name: download service packages
121-
uses: actions/download-artifact@v4
122+
uses: actions/download-artifact@v3
122123
with:
123124
name: mage.service-artifacts
124125
- name: download web-app packages
125-
uses: actions/download-artifact@v4
126+
uses: actions/download-artifact@v3
126127
with:
127128
name: mage.web-app-artifacts
128129
- name: publish to package registry

plugins/arcgis/service/package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@
4747
"@ngageoint/mage.service": "^6.2.9 || ^6.3.0-beta",
4848
"express": "^4.17.0"
4949
},
50-
"optionalDependencies": {
51-
"fsevents": "^2.3.3"
52-
},
5350
"devDependencies": {
5451
"@types/express": "^4.17.21",
5552
"@types/geojson": "^7946.0.7",
@@ -61,4 +58,4 @@
6158
"ts-jest": "^26.1.1",
6259
"typescript": "^4.6.3"
6360
}
64-
}
61+
}

plugins/image/service/package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@
4040
"express": "~4.17.0",
4141
"mongoose": "^6.13.0"
4242
},
43-
"optionalDependencies": {
44-
"fsevents": "^2.3.3"
45-
},
4643
"devDependencies": {
4744
"@types/bson": "^4.0.2",
4845
"@types/express": "~4.17.17",
@@ -56,4 +53,4 @@
5653
"rimraf": "^5.0.5",
5754
"typescript": "^4.9.5"
5855
}
59-
}
56+
}

0 commit comments

Comments
 (0)