mirror of
https://github.com/yeicor-3d/yet-another-cad-viewer.git
synced 2025-12-20 14:37:03 +01:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
40b4d51895 | ||
|
|
af68f8b1ff | ||
|
|
9cb6b29c93 | ||
|
|
3174a39ef9 | ||
|
|
78231aff31 | ||
|
|
39f1231f90 | ||
|
|
ed9251faac |
13
.github/workflows/deploy1.yml
vendored
13
.github/workflows/deploy1.yml
vendored
@@ -14,6 +14,17 @@ jobs:
|
|||||||
runs-on: "ubuntu-latest"
|
runs-on: "ubuntu-latest"
|
||||||
steps:
|
steps:
|
||||||
- uses: "actions/checkout@v4"
|
- uses: "actions/checkout@v4"
|
||||||
|
with: # Ensure we are not in a detached HEAD state
|
||||||
|
ref: "master"
|
||||||
|
# Check that the tag commit is the latest master commit
|
||||||
|
- run: |
|
||||||
|
git fetch --tags
|
||||||
|
tag_commit=$(git rev-parse ${{ github.ref }})
|
||||||
|
master_commit=$(git rev-parse master)
|
||||||
|
if [ "$tag_commit" != "$master_commit" ]; then
|
||||||
|
echo "The tag commit ($tag_commit) is not the latest master commit ($master_commit)"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
- run: "echo 'CLEAN_VERSION=${{ github.ref }}' | sed 's,refs/tags/v,,g' >> $GITHUB_ENV"
|
- run: "echo 'CLEAN_VERSION=${{ github.ref }}' | sed 's,refs/tags/v,,g' >> $GITHUB_ENV"
|
||||||
# Write the new version to package.json
|
# Write the new version to package.json
|
||||||
- uses: "actions/setup-node@v4"
|
- uses: "actions/setup-node@v4"
|
||||||
@@ -32,7 +43,7 @@ jobs:
|
|||||||
if git commit -am "Automatically update version to $CLEAN_VERSION"; then
|
if git commit -am "Automatically update version to $CLEAN_VERSION"; then
|
||||||
git push
|
git push
|
||||||
# Move the tag to the new commit
|
# Move the tag to the new commit
|
||||||
git tag -f -a "$VERSION" -m "$VERSION"
|
git tag -f -a "$CLEAN_VERSION" -m "$CLEAN_VERSION"
|
||||||
git push -f --tags # Force push the tag to GitHub
|
git push -f --tags # Force push the tag to GitHub
|
||||||
# The tag move will NOT trigger a new workflow
|
# The tag move will NOT trigger a new workflow
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "yet-another-cad-viewer",
|
"name": "yet-another-cad-viewer",
|
||||||
"version": "0.6.0",
|
"version": "0.6.7",
|
||||||
"description": "",
|
"description": "",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"private": true,
|
"private": true,
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "yacv-server"
|
name = "yacv-server"
|
||||||
version = "0.6.0"
|
version = "0.6.7"
|
||||||
description = "Yet Another CAD Viewer (server)"
|
description = "Yet Another CAD Viewer (server)"
|
||||||
authors = ["Yeicor <4929005+Yeicor@users.noreply.github.com>"]
|
authors = ["Yeicor <4929005+Yeicor@users.noreply.github.com>"]
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
|||||||
Reference in New Issue
Block a user