From 647c2231fd8966d9bc77a0a4550b2042856e491e Mon Sep 17 00:00:00 2001 From: Giorgio Scorzelli Date: Tue, 21 May 2024 09:05:29 +0200 Subject: [PATCH] new version --- .github/workflows/build-openvisuspy.yml | 19 +------------------ README.md | 17 ----------------- 2 files changed, 1 insertion(+), 35 deletions(-) diff --git a/.github/workflows/build-openvisuspy.yml b/.github/workflows/build-openvisuspy.yml index 1b5d865..737730d 100644 --- a/.github/workflows/build-openvisuspy.yml +++ b/.github/workflows/build-openvisuspy.yml @@ -17,24 +17,7 @@ jobs: architecture: x64 - run: | set -ex - GIT_TAG=`git describe --tags --exact-match 2>/dev/null || true` - if [[ "${GIT_TAG}" != "" ]] ; then - python3 -m pip install --upgrade pip - python3 -m pip install hatch - python3 -m build . --wheel - hatch publish --yes --no-prompt --user ${{ secrets.PYPI_USERNAME }} --client-key ${{ secrets.PYPI_TOKEN }} - - # get last OpenVisus version - python3 -m pip install --upgrade OpenVisusNoGui - OPENVISUS_VERSION=$(python3 -c "from importlib.metadata import version;print(version('OpenVisusNoGui'))") - - # build and publish docker - docker build --build-arg="OPENVISUS_VERSION=${OPENVISUS_VERSION}" --build-arg="GIT_TAG=${GIT_TAG}" --tag nsdf/openvisuspy:${GIT_TAG} ./ - echo ${{ secrets.DOCKER_TOKEN }} | docker login -u=${{ secrets.DOCKER_USERNAME }} --password-stdin - docker push nsdf/openvisuspy:${GIT_TAG} - docker push nsdf/openvisuspy:latest - - fi + source scripts/ubuntu.sh diff --git a/README.md b/README.md index e070f27..89e442e 100644 --- a/README.md +++ b/README.md @@ -106,26 +106,9 @@ Deploy binaries # commit a new tagget version GIT_TAG=$(python3 ./scripts/new_tag.py) -# GitHub git commit -a -m "New tag ($GIT_TAG)" git tag -a ${GIT_TAG} -m "${GIT_TAG}" git push origin ${GIT_TAG} git push origin - -# upload (for Windows use the prompt) -# python3 -m pip install hatch -rm -f ./dist/* -python3 -m build . --wheel -hatch publish --yes --no-prompt --user ${PYPI_USERNAME} --client-key ${PYPI_PASSWORD} - -# get latest OpenVisusNoGui -python3 -m pip install --upgrade OpenVisusNoGui -OPENVISUS_VERSION=$(python3 -c "from importlib.metadata import version;print(version('OpenVisusNoGui'))") - -# Docker -sudo docker build --build-arg="OPENVISUS_VERSION=${OPENVISUS_VERSION}" --build-arg="GIT_TAG=${GIT_TAG}" --tag nsdf/openvisuspy:${GIT_TAG} ./ -sudo docker run -it --rm -p 8888:8888 -v ./notebooks:/home/notebooks nsdf/openvisuspy:${GIT_TAG} -sudo docker push nsdf/openvisuspy:${GIT_TAG} -sudo docker push nsdf/openvisuspy:latest ```