Skip to content

Commit 650f3b8

Browse files
authored
fix: github actions fix (#658)
1 parent 850746d commit 650f3b8

File tree

5 files changed

+105
-32
lines changed

5 files changed

+105
-32
lines changed

.changeset/proud-timers-battle.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"vscode-ui5-language-assistant": patch
3+
"@ui5-language-assistant/vscode-ui5-language-assistant-bas-ext": patch
4+
---
5+
6+
Github actions workflow fix, lerna version rollback

.github/workflows/deploy_maual.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ on:
77
jobs:
88
deploy-npm:
99
if: github.repository == 'SAP/ui5-language-assistant' && github.ref == 'refs/heads/master'
10-
runs-on: [ubuntu-latest]
10+
strategy:
11+
matrix:
12+
os: [ubuntu-latest]
13+
node-version: [14.x]
14+
runs-on: ${{ matrix.os }}
15+
1116

1217
steps:
1318
- name: Checkout code repository
1419
uses: actions/checkout@v3
1520

16-
- name: Setup node
17-
uses: actions/setup-node@v3
18-
with:
19-
node-version: 14
20-
2121
- name: Run install
2222
uses: borales/actions-yarn@v4
2323
with:

.github/workflows/release.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,11 @@ jobs:
5959
version:
6060
# Run version job only on pushes to the main branch. The job depends on completion of the build job.
6161
if: github.repository == 'SAP/ui5-language-assistant' && github.event_name == 'push' && github.ref == 'refs/heads/master'
62-
runs-on: ubuntu-latest
62+
strategy:
63+
matrix:
64+
os: [ubuntu-latest]
65+
node-version: [14.x]
66+
runs-on: ${{ matrix.os }}
6367
needs: [build, compliance]
6468
outputs:
6569
changes: ${{ steps.changesetVersion.outputs.changes }} # map step output to job output
@@ -70,10 +74,6 @@ jobs:
7074
with:
7175
fetch-depth: 0
7276
token: ${{ secrets.ACCESS_PAT }} # needed to auto trigger release job
73-
- name: Setup node
74-
uses: actions/setup-node@v3
75-
with:
76-
node-version: 14
7777

7878
- name: Run install
7979
uses: borales/actions-yarn@v4

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"jest-sonar": "0.2.16",
7676
"jest-specific-snapshot": "3.0.0",
7777
"klaw-sync": "6.0.0",
78-
"lerna": "7.0.2",
78+
"lerna": "^7.0.2",
7979
"lint-staged": "10.5.3",
8080
"make-dir": "3.1.0",
8181
"mock-fs": "^5.2.0",

yarn.lock

Lines changed: 87 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,32 +1201,84 @@
12011201
resolved "https://registry.yarnpkg.com/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz#8ace5259254426ccef57f3175bc64ed7095ed919"
12021202
integrity sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==
12031203

1204-
"@lerna/child-process@7.0.2":
1205-
version "7.0.2"
1206-
resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-7.0.2.tgz#0ea270dcc34cbece6b5319f1d4a24733060883bd"
1207-
integrity sha512-15lMrNBL/pvREMJPSfIPieaBtyyapDco/TNjALLEL53JGzO9g8rj5PipfE9h5ILx8aq/GaP17XCh209aVCun/w==
1204+
"@lerna/child-process@7.3.0":
1205+
version "7.3.0"
1206+
resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-7.3.0.tgz#c56488a8a881f22a64793bf9339c5a2450a18559"
1207+
integrity sha512-rA+fGUo2j/LEq6w1w8s6oVikLbJTWoIDVpYMc7bUCtwDOUuZKMQiRtjmpavY3fTm7ltu42f4AKflc2A70K4wvA==
12081208
dependencies:
12091209
chalk "^4.1.0"
12101210
execa "^5.0.0"
12111211
strong-log-transformer "^2.1.0"
12121212

1213-
"@lerna/create@7.0.2":
1214-
version "7.0.2"
1215-
resolved "https://registry.yarnpkg.com/@lerna/create/-/create-7.0.2.tgz#a9335b889b54a456b3efc953f109aaf1d134b40a"
1216-
integrity sha512-1arGpEpWbWmci1MyaGKvP2SqCAPFWpLqZp0swckianX1kx1mso9B16BWFvcHhU57zCD0Co/z+jX+02UEzZGP7Q==
1213+
"@lerna/create@7.3.0":
1214+
version "7.3.0"
1215+
resolved "https://registry.yarnpkg.com/@lerna/create/-/create-7.3.0.tgz#5438c231f617b8e825731390d394f8684af471d5"
1216+
integrity sha512-fjgiKjg9VXwQ4ZKKsrXICEKRiC3yo6+FprR0mc55uz0s5e9xupoSGLobUTTBdE7ncNB3ibqml8dfaAn/+ESajQ==
12171217
dependencies:
1218-
"@lerna/child-process" "7.0.2"
1218+
"@lerna/child-process" "7.3.0"
1219+
"@npmcli/run-script" "6.0.2"
1220+
"@nx/devkit" ">=16.5.1 < 17"
1221+
"@octokit/plugin-enterprise-rest" "6.0.1"
1222+
"@octokit/rest" "19.0.11"
1223+
byte-size "8.1.1"
1224+
chalk "4.1.0"
1225+
clone-deep "4.0.1"
1226+
cmd-shim "6.0.1"
1227+
columnify "1.6.0"
1228+
conventional-changelog-core "5.0.1"
1229+
conventional-recommended-bump "7.0.1"
1230+
cosmiconfig "^8.2.0"
12191231
dedent "0.7.0"
1232+
execa "5.0.0"
12201233
fs-extra "^11.1.1"
1234+
get-stream "6.0.0"
1235+
git-url-parse "13.1.0"
1236+
glob-parent "5.1.2"
1237+
globby "11.1.0"
1238+
graceful-fs "4.2.11"
1239+
has-unicode "2.0.1"
1240+
ini "^1.3.8"
12211241
init-package-json "5.0.0"
1242+
inquirer "^8.2.4"
1243+
is-ci "3.0.1"
1244+
is-stream "2.0.0"
1245+
js-yaml "4.1.0"
1246+
libnpmpublish "7.3.0"
1247+
load-json-file "6.2.0"
1248+
lodash "^4.17.21"
1249+
make-dir "4.0.0"
1250+
minimatch "3.0.5"
1251+
multimatch "5.0.0"
1252+
node-fetch "2.6.7"
12221253
npm-package-arg "8.1.1"
1254+
npm-packlist "5.1.1"
1255+
npm-registry-fetch "^14.0.5"
1256+
npmlog "^6.0.2"
1257+
nx ">=16.5.1 < 17"
1258+
p-map "4.0.0"
1259+
p-map-series "2.1.0"
1260+
p-queue "6.6.2"
12231261
p-reduce "^2.1.0"
12241262
pacote "^15.2.0"
12251263
pify "5.0.0"
1264+
read-cmd-shim "4.0.0"
1265+
read-package-json "6.0.4"
1266+
resolve-from "5.0.0"
1267+
rimraf "^4.4.1"
12261268
semver "^7.3.4"
1269+
signal-exit "3.0.7"
12271270
slash "^3.0.0"
1271+
ssri "^9.0.1"
1272+
strong-log-transformer "2.1.0"
1273+
tar "6.1.11"
1274+
temp-dir "1.0.0"
1275+
upath "2.0.1"
1276+
uuid "^9.0.0"
12281277
validate-npm-package-license "^3.0.4"
12291278
validate-npm-package-name "5.0.0"
1279+
write-file-atomic "5.0.1"
1280+
write-pkg "4.0.0"
1281+
yargs "16.2.0"
12301282
yargs-parser "20.2.4"
12311283

12321284
"@manypkg/find-root@^1.1.0":
@@ -1355,7 +1407,7 @@
13551407
nx "16.9.1"
13561408
tslib "^2.3.0"
13571409

1358-
"@nx/devkit@16.9.1", "@nx/devkit@>=16.1.3 < 17":
1410+
"@nx/devkit@16.9.1", "@nx/devkit@>=16.5.1 < 17":
13591411
version "16.9.1"
13601412
resolved "https://registry.yarnpkg.com/@nx/devkit/-/devkit-16.9.1.tgz#819f355849eecde24b40634150af3038d2652570"
13611413
integrity sha512-jQMLX8pUKsOIk0tLFzJms5awPxKfJEi0uxY7+IUfRNHcnDkOFiv6gf1QqJ3pobmgwBdbC6Nv/dhDP3JT2wA1gA==
@@ -6672,15 +6724,15 @@ lcov-parse@^1.0.0:
66726724
resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-1.0.0.tgz#eb0d46b54111ebc561acb4c408ef9363bdc8f7e0"
66736725
integrity sha512-aprLII/vPzuQvYZnDRU78Fns9I2Ag3gi4Ipga/hxnVMCZC8DnR2nI7XBqrPoywGfxqIx/DgarGvDJZAD3YBTgQ==
66746726

6675-
lerna@7.0.2:
6676-
version "7.0.2"
6677-
resolved "https://registry.yarnpkg.com/lerna/-/lerna-7.0.2.tgz#45e844bfca72d12cc285c9a00f6f2cfb341bed05"
6678-
integrity sha512-omFpf1pTiaObC2YOC7K+euaDwhQA9CyKN1kXxmlSwaSkh8b8QTs4SC8jp3oNeXfcHpVS1ttuuz98AvQvJD46wA==
6727+
lerna@^7.0.2:
6728+
version "7.3.0"
6729+
resolved "https://registry.yarnpkg.com/lerna/-/lerna-7.3.0.tgz#efecafbdce15694e2f6841256e073a3a2061053e"
6730+
integrity sha512-Dt8TH+J+c9+3MhTYcm5OxnNzXb87WG7GPNj3kidjYJjJY7KxIMDNU37qBTYRWA1h3wAeNKBplXVQYUPkGcYgkQ==
66796731
dependencies:
6680-
"@lerna/child-process" "7.0.2"
6681-
"@lerna/create" "7.0.2"
6732+
"@lerna/child-process" "7.3.0"
6733+
"@lerna/create" "7.3.0"
66826734
"@npmcli/run-script" "6.0.2"
6683-
"@nx/devkit" ">=16.1.3 < 17"
6735+
"@nx/devkit" ">=16.5.1 < 17"
66846736
"@octokit/plugin-enterprise-rest" "6.0.1"
66856737
"@octokit/rest" "19.0.11"
66866738
byte-size "8.1.1"
@@ -6714,15 +6766,16 @@ lerna@7.0.2:
67146766
libnpmaccess "7.0.2"
67156767
libnpmpublish "7.3.0"
67166768
load-json-file "6.2.0"
6717-
make-dir "3.1.0"
6769+
lodash "^4.17.21"
6770+
make-dir "4.0.0"
67186771
minimatch "3.0.5"
67196772
multimatch "5.0.0"
67206773
node-fetch "2.6.7"
67216774
npm-package-arg "8.1.1"
67226775
npm-packlist "5.1.1"
67236776
npm-registry-fetch "^14.0.5"
67246777
npmlog "^6.0.2"
6725-
nx ">=16.1.3 < 17"
6778+
nx ">=16.5.1 < 17"
67266779
p-map "4.0.0"
67276780
p-map-series "2.1.0"
67286781
p-pipe "3.1.0"
@@ -7069,6 +7122,13 @@ make-dir@3.1.0, make-dir@^3.0.0, make-dir@^3.0.2:
70697122
dependencies:
70707123
semver "^6.0.0"
70717124

7125+
make-dir@4.0.0:
7126+
version "4.0.0"
7127+
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
7128+
integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
7129+
dependencies:
7130+
semver "^7.5.3"
7131+
70727132
make-dir@^2.1.0:
70737133
version "2.1.0"
70747134
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -7779,7 +7839,7 @@ nwsapi@^2.2.2:
77797839
resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.4.tgz#fd59d5e904e8e1f03c25a7d5a15cfa16c714a1e5"
77807840
integrity sha512-NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g==
77817841

7782-
nx@16.9.1, "nx@>=16.1.3 < 17":
7842+
nx@16.9.1, "nx@>=16.5.1 < 17":
77837843
version "16.9.1"
77847844
resolved "https://registry.yarnpkg.com/nx/-/nx-16.9.1.tgz#eac231c4cdfd6b3f7088d57289e215fbd539b7a1"
77857845
integrity sha512-h6jp0fXzEsBO3pwCNS2JbfzJZRgE2DnIo7Sj1/1oBo82o44jNqsPo3nMTj95qhcveJ0qBiKIh+Xw/fghXiRiSQ==
@@ -8938,6 +8998,13 @@ semver@^6.0.0, semver@^6.3.0:
89388998
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
89398999
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
89409000

9001+
semver@^7.5.3:
9002+
version "7.5.4"
9003+
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
9004+
integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
9005+
dependencies:
9006+
lru-cache "^6.0.0"
9007+
89419008
set-blocking@^2.0.0:
89429009
version "2.0.0"
89439010
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"

0 commit comments

Comments
 (0)