From ea395a0a36927ebee56d485612bf595ef341ed27 Mon Sep 17 00:00:00 2001 From: Austin DeNoble Date: Thu, 12 Oct 2023 10:39:10 -0400 Subject: [PATCH] add phony for upload-spruce to makefile, clean up workflow files --- .github/workflows/nightly-spruce-dev-release.yaml | 2 -- .github/workflows/release-spruce.yaml | 2 -- Makefile | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/nightly-spruce-dev-release.yaml b/.github/workflows/nightly-spruce-dev-release.yaml index 2aada41a..2c494ca9 100644 --- a/.github/workflows/nightly-spruce-dev-release.yaml +++ b/.github/workflows/nightly-spruce-dev-release.yaml @@ -31,7 +31,6 @@ jobs: uses: andymckay/cancel-action@0.3 - name: Set spruce dev version - id: version run: | versionFile="pinecone/__version__" currentDate=$(date +%Y%m%d%H%M%S) @@ -58,7 +57,6 @@ jobs: run: make package - name: Upload Python Spruce client to Test PyPI - id: pypi_upload env: TWINE_REPOSITORY: testpypi PYPI_USERNAME: ${{ secrets.TEST_PYPI_USERNAME }} diff --git a/.github/workflows/release-spruce.yaml b/.github/workflows/release-spruce.yaml index 09d84819..ca78a841 100644 --- a/.github/workflows/release-spruce.yaml +++ b/.github/workflows/release-spruce.yaml @@ -18,7 +18,6 @@ jobs: ref: spruce - name: Set spruce dev version - id: version run: | versionFile="pinecone/__version__" currentDate=$(date +%Y%m%d%H%M%S) @@ -45,7 +44,6 @@ jobs: run: make package - name: Upload Python Spruce client to Test PyPI - id: pypi_upload env: TWINE_REPOSITORY: testpypi PYPI_USERNAME: ${{ secrets.TEST_PYPI_USERNAME }} diff --git a/Makefile b/Makefile index e10f4dce..62df52dd 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: image develop tests tag-and-push docs version package upload license +.PHONY: image develop tests tag-and-push docs version package upload upload-spruce license mkfile_path := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) PYPI_USERNAME ?= __token__