mirror of
https://github.com/yeicor-3d/yet-another-cad-viewer.git
synced 2025-12-19 22:24:17 +01:00
Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7144eb39da | ||
|
|
8e1c89ad6d | ||
|
|
7f692c0b52 | ||
|
|
86043132a8 | ||
|
|
23b4d25464 | ||
|
|
22514d8603 | ||
|
|
b440a89b13 | ||
|
|
cbdb5aff5e | ||
|
|
a3a9258a78 | ||
|
|
9f30ac8eb7 | ||
|
|
e11c9dd5c6 |
2
.github/workflows/deploy1.yml
vendored
2
.github/workflows/deploy1.yml
vendored
@@ -43,7 +43,7 @@ jobs:
|
||||
if git commit -am "Automatically update version to $CLEAN_VERSION"; then
|
||||
git push
|
||||
# Move the tag to the new commit
|
||||
git tag -f -a "$CLEAN_VERSION" -m "$CLEAN_VERSION"
|
||||
git tag -f -a "v$CLEAN_VERSION" -m "v$CLEAN_VERSION"
|
||||
git push -f --tags # Force push the tag to GitHub
|
||||
# The tag move will NOT trigger a new workflow
|
||||
else
|
||||
|
||||
36
.github/workflows/deploy2.yml
vendored
36
.github/workflows/deploy2.yml
vendored
@@ -32,24 +32,14 @@ jobs:
|
||||
name: "github-pages"
|
||||
url: "${{ steps.deployment.outputs.page_url }}"
|
||||
steps:
|
||||
- uses: "dawidd6/action-download-artifact@v3"
|
||||
with:
|
||||
workflow: "build.yml"
|
||||
name: "frontend"
|
||||
- uses: "actions/download-artifact@v4"
|
||||
with: # Downloads all artifacts from the build job
|
||||
path: "./public"
|
||||
allow_forks: false
|
||||
- uses: "dawidd6/action-download-artifact@v3"
|
||||
with:
|
||||
workflow: "build.yml"
|
||||
name: "logo"
|
||||
path: "./public"
|
||||
allow_forks: false
|
||||
- uses: "dawidd6/action-download-artifact@v3"
|
||||
with:
|
||||
workflow: "build.yml"
|
||||
name: "example"
|
||||
path: "./public"
|
||||
allow_forks: false
|
||||
- run: | # Merge the subdirectories of public into a single directory
|
||||
for dir in public/*; do
|
||||
mv "$dir/"* public/
|
||||
rmdir "$dir"
|
||||
done
|
||||
- uses: "actions/configure-pages@v4"
|
||||
- uses: "actions/upload-pages-artifact@v3"
|
||||
with:
|
||||
@@ -71,7 +61,15 @@ jobs:
|
||||
- uses: "actions/checkout@v4"
|
||||
with:
|
||||
ref: "${{ inputs.ref }}"
|
||||
- uses: "JRubics/poetry-publish@v2.0"
|
||||
- uses: "actions/setup-node@v4"
|
||||
with:
|
||||
cache: "yarn"
|
||||
- run: "pipx install poetry"
|
||||
- uses: "actions/setup-python@v5"
|
||||
with:
|
||||
python-version: "3.11"
|
||||
pypi_token: "${{ secrets.PYPI_TOKEN }}"
|
||||
cache: "poetry"
|
||||
- run: "poetry install"
|
||||
- run: "poetry config pypi-token.pypi ${{ secrets.PYPI_TOKEN }}"
|
||||
- run: "poetry publish --build"
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "yet-another-cad-viewer",
|
||||
"version": "0.6.8",
|
||||
"version": "0.6.12",
|
||||
"description": "",
|
||||
"license": "MIT",
|
||||
"private": true,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[tool.poetry]
|
||||
name = "yacv-server"
|
||||
version = "0.6.8"
|
||||
version = "0.6.12"
|
||||
description = "Yet Another CAD Viewer (server)"
|
||||
authors = ["Yeicor <4929005+Yeicor@users.noreply.github.com>"]
|
||||
license = "MIT"
|
||||
|
||||
Reference in New Issue
Block a user