From 9bc6e2fd12d48b63925c11a0585c5cee4497ccdf Mon Sep 17 00:00:00 2001 From: jem Date: Fri, 3 Jul 2020 15:46:31 +0200 Subject: [PATCH] td #4 --- .github/workflows/release.yml | 57 ---------------------------------- .github/workflows/stable.yml | 43 ++++++++++++++++++++----- .github/workflows/unstable.yml | 24 ++++++++++---- 3 files changed, 54 insertions(+), 70 deletions(-) delete mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index a01f411..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,57 +0,0 @@ -name: build -on: - push: - tags: - - never - -jobs: - build: - name: build&upload - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - - name: Use python 3.x - uses: actions/setup-python@v2 - with: - python-version: '3.x' - - - name: install dependencies - run: | - python -m pip install --upgrade pip - pip install pybuilder ddadevops deprecation setuptools - - - name: debug - run: | - echo ${{ github.ref }} - echo ${{ github.ref == '[0-9]+.[0-9]+.[0-9]' }} - echo ${{ github.ref != '[0-9]+.[0-9]+.[0-9]' }} - - - name: build stable release - if: ${{ github.tag == '[0-9]+.[0-9]+.[0-9]' }} - env: - TWINE_USERNAME: dda - TWINE_PASSWORD: ${{ secrets.PYPI_DDA }} - run: | - pyb -P version=${{ github.tag }} publish upload - - - name: build unstable release - if: ${{ github.tag != '[0-9]+.[0-9]+.[0-9]' }} - env: - TWINE_USERNAME: dda - TWINE_PASSWORD: ${{ secrets.PYPI_DDA }} - run: | - pyb publish upload - - - name: Create GH Release - if: ${{ github.tag == '[0-9]+.[0-9]+.[0-9]' }} - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} - draft: false - prerelease: false diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml index c31a8d6..3426896 100644 --- a/.github/workflows/stable.yml +++ b/.github/workflows/stable.yml @@ -6,13 +6,42 @@ on: jobs: build: - name: test-my build + name: stable build runs-on: ubuntu-latest - steps: + jobs: + build: + name: build&upload + runs-on: ubuntu-latest - - name: debug - run: | - echo ${{ github.ref }} - echo ${{ github.ref == '[0-9]+.[0-9]+.[0-9]+' }} - echo ${{ github.ref != '[0-9]+.[0-9]+.[0-9]+' }} + steps: + - uses: actions/checkout@v2 + + - name: Use python 3.x + uses: actions/setup-python@v2 + with: + python-version: '3.x' + + - name: install dependencies + run: | + python -m pip install --upgrade pip + pip install pybuilder ddadevops deprecation setuptools + + - name: build stable release + env: + TWINE_USERNAME: dda + TWINE_PASSWORD: ${{ secrets.PYPI_DDA }} + run: | + pyb -P version=${{ github.ref }} publish upload + + - name: Create GH Release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + release_name: Release ${{ github.ref }} + draft: false + prerelease: false + \ No newline at end of file diff --git a/.github/workflows/unstable.yml b/.github/workflows/unstable.yml index ca2656f..3ff8481 100644 --- a/.github/workflows/unstable.yml +++ b/.github/workflows/unstable.yml @@ -9,13 +9,25 @@ on: jobs: build: - name: test-my build + name: unstable runs-on: ubuntu-latest steps: - - - name: debug + - uses: actions/checkout@v2 + + - name: Use python 3.x + uses: actions/setup-python@v2 + with: + python-version: '3.x' + + - name: install dependencies + run: | + python -m pip install --upgrade pip + pip install pybuilder ddadevops deprecation setuptools + + - name: build unstable release + env: + TWINE_USERNAME: dda + TWINE_PASSWORD: ${{ secrets.PYPI_DDA }} run: | - echo ${{ github.ref }} - echo ${{ github.ref == '[0-9]+.[0-9]+.[0-9]+' }} - echo ${{ github.ref != '[0-9]+.[0-9]+.[0-9]+' }} + pyb publish upload