Skip to content

Commit

Permalink
fix: github actions fix (#658)
Browse files Browse the repository at this point in the history
  • Loading branch information
@vadson71
vadson71 committed Sep 29, 2023
1 parent 850746d commit 650f3b8
Show file tree
Hide file tree
Showing 5 changed files with 105 additions and 32 deletions.
6 changes: 6 additions & 0 deletions .changeset/proud-timers-battle.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"vscode-ui5-language-assistant": patch
"@ui5-language-assistant/vscode-ui5-language-assistant-bas-ext": patch
---

Github actions workflow fix, lerna version rollback
12 changes: 6 additions & 6 deletions .github/workflows/deploy_maual.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ on:
jobs:
deploy-npm:
if: github.repository == 'SAP/ui5-language-assistant' && github.ref == 'refs/heads/master'
runs-on: [ubuntu-latest]
strategy:
matrix:
os: [ubuntu-latest]
node-version: [14.x]
runs-on: ${{ matrix.os }}


steps:
- name: Checkout code repository
uses: actions/checkout@v3

- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 14

- name: Run install
uses: borales/actions-yarn@v4
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@ jobs:
version:
# Run version job only on pushes to the main branch. The job depends on completion of the build job.
if: github.repository == 'SAP/ui5-language-assistant' && github.event_name == 'push' && github.ref == 'refs/heads/master'
runs-on: ubuntu-latest
strategy:
matrix:
os: [ubuntu-latest]
node-version: [14.x]
runs-on: ${{ matrix.os }}
needs: [build, compliance]
outputs:
changes: ${{ steps.changesetVersion.outputs.changes }} # map step output to job output
Expand All @@ -70,10 +74,6 @@ jobs:
with:
fetch-depth: 0
token: ${{ secrets.ACCESS_PAT }} # needed to auto trigger release job
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 14

- name: Run install
uses: borales/actions-yarn@v4
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"jest-sonar": "0.2.16",
"jest-specific-snapshot": "3.0.0",
"klaw-sync": "6.0.0",
"lerna": "7.0.2",
"lerna": "^7.0.2",
"lint-staged": "10.5.3",
"make-dir": "3.1.0",
"mock-fs": "^5.2.0",
Expand Down
107 changes: 87 additions & 20 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1201,32 +1201,84 @@
resolved "https://registry.yarnpkg.com/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz#8ace5259254426ccef57f3175bc64ed7095ed919"
integrity sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==

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

"@lerna/create@7.0.2":
version "7.0.2"
resolved "https://registry.yarnpkg.com/@lerna/create/-/create-7.0.2.tgz#a9335b889b54a456b3efc953f109aaf1d134b40a"
integrity sha512-1arGpEpWbWmci1MyaGKvP2SqCAPFWpLqZp0swckianX1kx1mso9B16BWFvcHhU57zCD0Co/z+jX+02UEzZGP7Q==
"@lerna/create@7.3.0":
version "7.3.0"
resolved "https://registry.yarnpkg.com/@lerna/create/-/create-7.3.0.tgz#5438c231f617b8e825731390d394f8684af471d5"
integrity sha512-fjgiKjg9VXwQ4ZKKsrXICEKRiC3yo6+FprR0mc55uz0s5e9xupoSGLobUTTBdE7ncNB3ibqml8dfaAn/+ESajQ==
dependencies:
"@lerna/child-process" "7.0.2"
"@lerna/child-process" "7.3.0"
"@npmcli/run-script" "6.0.2"
"@nx/devkit" ">=16.5.1 < 17"
"@octokit/plugin-enterprise-rest" "6.0.1"
"@octokit/rest" "19.0.11"
byte-size "8.1.1"
chalk "4.1.0"
clone-deep "4.0.1"
cmd-shim "6.0.1"
columnify "1.6.0"
conventional-changelog-core "5.0.1"
conventional-recommended-bump "7.0.1"
cosmiconfig "^8.2.0"
dedent "0.7.0"
execa "5.0.0"
fs-extra "^11.1.1"
get-stream "6.0.0"
git-url-parse "13.1.0"
glob-parent "5.1.2"
globby "11.1.0"
graceful-fs "4.2.11"
has-unicode "2.0.1"
ini "^1.3.8"
init-package-json "5.0.0"
inquirer "^8.2.4"
is-ci "3.0.1"
is-stream "2.0.0"
js-yaml "4.1.0"
libnpmpublish "7.3.0"
load-json-file "6.2.0"
lodash "^4.17.21"
make-dir "4.0.0"
minimatch "3.0.5"
multimatch "5.0.0"
node-fetch "2.6.7"
npm-package-arg "8.1.1"
npm-packlist "5.1.1"
npm-registry-fetch "^14.0.5"
npmlog "^6.0.2"
nx ">=16.5.1 < 17"
p-map "4.0.0"
p-map-series "2.1.0"
p-queue "6.6.2"
p-reduce "^2.1.0"
pacote "^15.2.0"
pify "5.0.0"
read-cmd-shim "4.0.0"
read-package-json "6.0.4"
resolve-from "5.0.0"
rimraf "^4.4.1"
semver "^7.3.4"
signal-exit "3.0.7"
slash "^3.0.0"
ssri "^9.0.1"
strong-log-transformer "2.1.0"
tar "6.1.11"
temp-dir "1.0.0"
upath "2.0.1"
uuid "^9.0.0"
validate-npm-package-license "^3.0.4"
validate-npm-package-name "5.0.0"
write-file-atomic "5.0.1"
write-pkg "4.0.0"
yargs "16.2.0"
yargs-parser "20.2.4"

"@manypkg/find-root@^1.1.0":
Expand Down Expand Up @@ -1355,7 +1407,7 @@
nx "16.9.1"
tslib "^2.3.0"

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

lerna@7.0.2:
version "7.0.2"
resolved "https://registry.yarnpkg.com/lerna/-/lerna-7.0.2.tgz#45e844bfca72d12cc285c9a00f6f2cfb341bed05"
integrity sha512-omFpf1pTiaObC2YOC7K+euaDwhQA9CyKN1kXxmlSwaSkh8b8QTs4SC8jp3oNeXfcHpVS1ttuuz98AvQvJD46wA==
lerna@^7.0.2:
version "7.3.0"
resolved "https://registry.yarnpkg.com/lerna/-/lerna-7.3.0.tgz#efecafbdce15694e2f6841256e073a3a2061053e"
integrity sha512-Dt8TH+J+c9+3MhTYcm5OxnNzXb87WG7GPNj3kidjYJjJY7KxIMDNU37qBTYRWA1h3wAeNKBplXVQYUPkGcYgkQ==
dependencies:
"@lerna/child-process" "7.0.2"
"@lerna/create" "7.0.2"
"@lerna/child-process" "7.3.0"
"@lerna/create" "7.3.0"
"@npmcli/run-script" "6.0.2"
"@nx/devkit" ">=16.1.3 < 17"
"@nx/devkit" ">=16.5.1 < 17"
"@octokit/plugin-enterprise-rest" "6.0.1"
"@octokit/rest" "19.0.11"
byte-size "8.1.1"
Expand Down Expand Up @@ -6714,15 +6766,16 @@ lerna@7.0.2:
libnpmaccess "7.0.2"
libnpmpublish "7.3.0"
load-json-file "6.2.0"
make-dir "3.1.0"
lodash "^4.17.21"
make-dir "4.0.0"
minimatch "3.0.5"
multimatch "5.0.0"
node-fetch "2.6.7"
npm-package-arg "8.1.1"
npm-packlist "5.1.1"
npm-registry-fetch "^14.0.5"
npmlog "^6.0.2"
nx ">=16.1.3 < 17"
nx ">=16.5.1 < 17"
p-map "4.0.0"
p-map-series "2.1.0"
p-pipe "3.1.0"
Expand Down Expand Up @@ -7069,6 +7122,13 @@ make-dir@3.1.0, make-dir@^3.0.0, make-dir@^3.0.2:
dependencies:
semver "^6.0.0"

make-dir@4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
dependencies:
semver "^7.5.3"

make-dir@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
Expand Down Expand Up @@ -7779,7 +7839,7 @@ nwsapi@^2.2.2:
resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.4.tgz#fd59d5e904e8e1f03c25a7d5a15cfa16c714a1e5"
integrity sha512-NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g==

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

semver@^7.5.3:
version "7.5.4"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
dependencies:
lru-cache "^6.0.0"

set-blocking@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
Expand Down

0 comments on commit 650f3b8

Please sign in to comment.