Skip to content

Commit 757fa6c

Browse files
committed
correct package/publish packages to run in container
1 parent 0c5fa03 commit 757fa6c

File tree

5 files changed

+9
-26
lines changed

5 files changed

+9
-26
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
if: always()
9797

9898
package:
99-
needs: test
99+
#needs: test
100100
runs-on: ubuntu-latest
101101

102102
steps:
@@ -117,7 +117,6 @@ jobs:
117117
- uses: Gr1N/setup-poetry@v7
118118

119119
- run: pip install poetry-dynamic-versioning
120-
- run: pip install GitPython semantic-version
121120

122121
- run: poetry install
123122

scripts/npm_package.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
def main() -> None:
5-
run(["npm", "run", "package"], shell=True).check_returncode()
5+
run("npm run package", shell=True).check_returncode()
66

77

88
if __name__ == "__main__":

scripts/npm_publish.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
def main() -> None:
5-
run(["npm", "run", "publish"], shell=True).check_returncode()
5+
run("npm run publish", shell=True).check_returncode()
66

77

88
if __name__ == "__main__":

scripts/package.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,9 @@ def main() -> None:
4040

4141
pre_release = current_version.minor % 2 != 0
4242

43-
run(
44-
["npx", "vsce", "package", *(["--pre-release"] if pre_release else []), "-o", "./dist"], shell=True
45-
).check_returncode()
46-
47-
run(
48-
[
49-
"poetry",
50-
"build",
51-
],
52-
shell=True,
53-
).check_returncode()
43+
run(f"npx vsce package {'--pre-release' if pre_release else ''} -o ./dist", shell=True).check_returncode()
44+
45+
run("poetry build", shell=True).check_returncode()
5446

5547

5648
if __name__ == "__main__":

scripts/publish.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,10 @@ def main() -> None:
4141

4242
vsix_path = Path(dist_path, f"robotcode-{current_version}.vsix")
4343

44-
run(["npx", "vsce", "publish", "-i", vsix_path], shell=True).check_returncode()
45-
run(["npx", "ovsx", "publish", vsix_path], shell=True).check_returncode()
44+
run(f"npx vsce publish -i {vsix_path}", shell=True).check_returncode()
45+
run(f"npx ovsx publish {vsix_path}", shell=True).check_returncode()
4646
run(
47-
[
48-
"poetry",
49-
"publish",
50-
"--username",
51-
os.environ["PYPI_USERNAME"],
52-
"--password",
53-
os.environ["PYPI_PASSWORD"],
54-
],
55-
shell=True,
47+
f"poetry publish --username {os.environ['PYPI_USERNAME']} --password {os.environ['PYPI_PASSWORD']}", shell=True
5648
).check_returncode()
5749

5850

0 commit comments

Comments
 (0)