fix: 更改gitea action获取版本号的方式
This commit is contained in:
parent
8982dd82d8
commit
dce678ca95
|
|
@ -27,16 +27,8 @@ jobs:
|
||||||
- run: |
|
- run: |
|
||||||
var=${{ gitea.repository }}
|
var=${{ gitea.repository }}
|
||||||
repo=${var##*/}
|
repo=${var##*/}
|
||||||
url="https://hub.airpig.cn/api/v2.0/projects/library/repositories/${repo}/artifacts?page=1&page_size=10&with_tag=true&with_label=false&with_scan_overview=false&with_signature=false&with_immutable_status=false&with_accessory=false"
|
version=$(grep -oP '(?<=version = ")(.*)(?=")' "pyproject.toml")
|
||||||
version=$(curl -X 'GET' $url \
|
new_version="v${version}"
|
||||||
-H 'accept: application/json' \
|
|
||||||
-H 'X-Accept-Vulnerabilities: application/vnd.security.vulnerability.report; version=1.1, application/vnd.scanner.adapter.vuln.report.harbor+json; version=1.0' \
|
|
||||||
-u 'admin:Chenweijia!' | jq '.[0].tags[0].name')
|
|
||||||
if [ ! $version ]; then
|
|
||||||
new_version=v1.0.0
|
|
||||||
else
|
|
||||||
new_version=$(echo $version | sed 's/\"//g' | awk -F. '{$NF = $NF + 1;} 1' OFS=.)
|
|
||||||
fi
|
|
||||||
docker build -t hub.airpig.cn/library/$repo:$new_version .
|
docker build -t hub.airpig.cn/library/$repo:$new_version .
|
||||||
docker push hub.airpig.cn/library/$repo:$new_version
|
docker push hub.airpig.cn/library/$repo:$new_version
|
||||||
docker rmi hub.airpig.cn/library/$repo:$new_version
|
docker rmi hub.airpig.cn/library/$repo:$new_version
|
||||||
|
|
|
||||||
|
|
@ -25,17 +25,8 @@ jobs:
|
||||||
- run: |
|
- run: |
|
||||||
var=${{ gitea.repository }}
|
var=${{ gitea.repository }}
|
||||||
repo=${var##*/}"-runtime"
|
repo=${var##*/}"-runtime"
|
||||||
echo $repo
|
ersion=$(grep -oP '(?<=version = ")(.*)(?=")' "pyproject.toml")
|
||||||
url="https://hub.airpig.cn/api/v2.0/projects/library/repositories/${repo}/artifacts?page=1&page_size=10&with_tag=true&with_label=false&with_scan_overview=false&with_signature=false&with_immutable_status=false&with_accessory=false"
|
new_version="v${version}"
|
||||||
version=$(curl -X 'GET' $url \
|
|
||||||
-H 'accept: application/json' \
|
|
||||||
-H 'X-Accept-Vulnerabilities: application/vnd.security.vulnerability.report; version=1.1, application/vnd.scanner.adapter.vuln.report.harbor+json; version=1.0' \
|
|
||||||
-u 'admin:Chenweijia!' | jq '.[0].tags[0].name')
|
|
||||||
if [ ! $version ]; then
|
|
||||||
new_version=v1.0.0
|
|
||||||
else
|
|
||||||
new_version=$(echo $version | sed 's/\"//g' | awk -F. '{$NF = $NF + 1;} 1' OFS=.)
|
|
||||||
fi
|
|
||||||
docker build -t hub.airpig.cn/library/$repo:$new_version -f RuntimeDockerfile .
|
docker build -t hub.airpig.cn/library/$repo:$new_version -f RuntimeDockerfile .
|
||||||
docker push hub.airpig.cn/library/$repo:$new_version
|
docker push hub.airpig.cn/library/$repo:$new_version
|
||||||
docker rmi hub.airpig.cn/library/$repo:$new_version
|
docker rmi hub.airpig.cn/library/$repo:$new_version
|
||||||
|
|
|
||||||
1
main.py
1
main.py
|
|
@ -15,7 +15,6 @@ from src.utils.exception import http_exception_handler, request_validation_error
|
||||||
import redis.asyncio as aio_redis
|
import redis.asyncio as aio_redis
|
||||||
from fastapi_limiter import FastAPILimiter
|
from fastapi_limiter import FastAPILimiter
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def create_app():
|
def create_app():
|
||||||
mysql_config, redis_config = init_config()
|
mysql_config, redis_config = init_config()
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "fastapi-app-template"
|
name = "fastapi-template"
|
||||||
version = "0.1.0"
|
version = "0.1.1"
|
||||||
description = ""
|
description = ""
|
||||||
authors = ["chenwj113 <chenwj113@gmail.com>"]
|
authors = ["chenwj113 <chenwj113@gmail.com>"]
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue