From 1cf29d3adda8739995b91a95a9a907c560905bc6 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Thu, 18 Jan 2024 19:03:15 -0800 Subject: [PATCH] Update automation for new repo Fix copy/paste leftovers in setup.py --- .github/workflows/license_tests.yml | 3 ++- .github/workflows/propose_release.yml | 1 - .github/workflows/publish_release.yml | 16 ++++++++++++++-- .github/workflows/publish_test_build.yml | 8 ++++++-- setup.py | 2 +- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.github/workflows/license_tests.yml b/.github/workflows/license_tests.yml index dcf543d..50b7775 100644 --- a/.github/workflows/license_tests.yml +++ b/.github/workflows/license_tests.yml @@ -7,4 +7,5 @@ on: - master jobs: license_tests: - uses: neongeckocom/.github/.github/workflows/license_tests.yml@master \ No newline at end of file + uses: neongeckocom/.github/.github/workflows/license_tests.yml@master + # TODO \ No newline at end of file diff --git a/.github/workflows/propose_release.yml b/.github/workflows/propose_release.yml index 68d6440..6a3614b 100644 --- a/.github/workflows/propose_release.yml +++ b/.github/workflows/propose_release.yml @@ -17,7 +17,6 @@ jobs: release_type: ${{ inputs.release_type }} update_changelog: True version_file: "neon_hana/version.py" - on_version_change: "scripts/sync_chart_app_version.py" pull_changes: uses: neongeckocom/.github/.github/workflows/pull_master.yml@master needs: update_version diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 96a0357..2cd2be9 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -7,6 +7,18 @@ on: - master jobs: - build_and_publish_pypi_and_release: - uses: neongeckocom/.github/.github/workflows/publish_stable_release.yml@master + tag_release: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Get Version + run: | + VERSION=$(python setup.py --version) + echo "VERSION=${VERSION}" >> $GITHUB_ENV + - uses: ncipollo/release-action@v1 + with: + token: ${{secrets.GITHUB_TOKEN}} + tag: ${{env.VERSION}} + build_and_publish_docker: + uses: neongeckocom/.github/.github/workflows/publish_docker.yml@master secrets: inherit \ No newline at end of file diff --git a/.github/workflows/publish_test_build.yml b/.github/workflows/publish_test_build.yml index 26d8bde..63b378c 100644 --- a/.github/workflows/publish_test_build.yml +++ b/.github/workflows/publish_test_build.yml @@ -14,6 +14,10 @@ jobs: uses: neongeckocom/.github/.github/workflows/publish_alpha_release.yml@master secrets: inherit with: - version_file: "neon_diana_utils/version.py" + version_file: "version.py" publish_prerelease: true - on_version_change: "scripts/sync_chart_app_version.py" \ No newline at end of file + publish_pypi: false + build_and_publish_docker: + needs: publish_alpha_release + uses: neongeckocom/.github/.github/workflows/publish_docker.yml@master + secrets: inherit \ No newline at end of file diff --git a/setup.py b/setup.py index eb6c40d..6627dbd 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ def get_requirements(requirements_filename: str): with open(path.join(BASE_PATH, "README.md"), "r") as f: long_description = f.read() -with open(path.join(BASE_PATH, "hana", +with open(path.join(BASE_PATH, "neon_hana", "version.py"), "r", encoding="utf-8") as v: for line in v.readlines(): if line.startswith("__version__"):