From 38ef44ad908e24a9814601f0b52cf9a2709ccb56 Mon Sep 17 00:00:00 2001 From: Andrii Lytovchenko Date: Sun, 17 Oct 2021 15:46:38 +0200 Subject: [PATCH 1/6] Update deployment.yml --- .github/workflows/deployment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 7960bc5ba..399c13939 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -43,7 +43,6 @@ jobs: id: PEP-440 # if: github.event_name == 'push' run: | - # TAG_NAME=${GITHUB_REF##*/} TAG_NAME=v1r0p4 NEW_STYLE=$(python -c "import diraccfg; major, minor, patch, pre = diraccfg.parseVersion('${TAG_NAME}'); print(f'{major}.{minor}.{patch}', f'a{pre}' if pre else '', sep='')") echo "Converted ${TAG_NAME} version to ${NEW_STYLE}" From 90bfd8b73658281df4de51acbf7770fe6a4b2cbb Mon Sep 17 00:00:00 2001 From: Andrii Lytovchenko Date: Sun, 17 Oct 2021 15:56:15 +0200 Subject: [PATCH 2/6] Update deployment.yml --- .github/workflows/deployment.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 399c13939..c87ada607 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -55,8 +55,6 @@ jobs: runs-on: "ubuntu-latest" needs: deploy-pypi steps: - - run: cat release.notes - - run: git tag - name: Publish ${{needs.deploy-pypi.outputs.tag_name}} release to GitHub # if: github.event_name == 'push' || ${{ inputs.deploy_github }} uses: softprops/action-gh-release@v1 From d2b292bd8f04629c786846a0687e6bfff6e16280 Mon Sep 17 00:00:00 2001 From: Andrii Lytovchenko Date: Sun, 17 Oct 2021 16:21:28 +0200 Subject: [PATCH 3/6] Update deployment.yml --- .github/workflows/deployment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index c87ada607..2c1d4b976 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -55,13 +55,13 @@ jobs: runs-on: "ubuntu-latest" needs: deploy-pypi steps: - - name: Publish ${{needs.deploy-pypi.outputs.tag_name}} release to GitHub + - name: Publish ${{ needs.deploy-pypi.outputs.tag_name }} release to GitHub # if: github.event_name == 'push' || ${{ inputs.deploy_github }} uses: softprops/action-gh-release@v1 with: target_commitish: ${{ needs.deploy-pypi.outputs.target_commitish }} body_path: release.notes - tag_name: ${{needs.deploy-pypi.outputs.tag_name}} + tag_name: ${{ needs.deploy-pypi.outputs.tag_name }} create-pypi-release: name: PyPI release deployment From 2eca82df279dcb9b7d04cac72df26d7658343223 Mon Sep 17 00:00:00 2001 From: Andrii Lytovchenko Date: Sun, 17 Oct 2021 16:24:28 +0200 Subject: [PATCH 4/6] Update deployment.yml --- .github/workflows/deployment.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 2c1d4b976..efc884785 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -23,9 +23,9 @@ jobs: deploy-pypi: name: PyPI deployment runs-on: "ubuntu-latest" - outputs: - tag_name: ${{ steps.PEP-440.outputs.tag_name }} - target_commitish: ${{ steps.PEP-440.outputs.target_commitish }} + #outputs: + # tag_name: ${{ steps.PEP-440.outputs.tag_name }} + # target_commitish: ${{ steps.PEP-440.outputs.target_commitish }} if: github.event_name != 'push' || github.repository == 'TaykYoku/WebAppDIRAC' steps: @@ -50,24 +50,24 @@ jobs: echo ::set-output name=tag_name::"v$NEW_STYLE" echo ::set-output name=target_commitish::"$(git rev-parse HEAD)" - create-pep440-release: - name: PEP-440 release deployment - runs-on: "ubuntu-latest" - needs: deploy-pypi - steps: - - name: Publish ${{ needs.deploy-pypi.outputs.tag_name }} release to GitHub + #create-pep440-release: + # name: PEP-440 release deployment + # runs-on: "ubuntu-latest" + # needs: deploy-pypi + # steps: + - name: Publish ${{ steps.PEP-440.outputs.tag_name }} release to GitHub # if: github.event_name == 'push' || ${{ inputs.deploy_github }} uses: softprops/action-gh-release@v1 with: - target_commitish: ${{ needs.deploy-pypi.outputs.target_commitish }} + target_commitish: ${{ steps.PEP-440.outputs.target_commitish }} body_path: release.notes - tag_name: ${{ needs.deploy-pypi.outputs.tag_name }} + tag_name: ${{ steps.PEP-440.outputs.tag_name }} - create-pypi-release: - name: PyPI release deployment - runs-on: "ubuntu-latest" - needs: [deploy-pypi, create-pep440-release] - steps: + #create-pypi-release: + # name: PyPI release deployment + # runs-on: "ubuntu-latest" + # needs: [deploy-pypi, create-pep440-release] + # steps: - name: Get ${{ steps.PEP-440.outputs.tag_name }} tag uses: actions/checkout@v2 with: From c12a7a18bc17ddca8c0f718d66aa00f1fdef2b8f Mon Sep 17 00:00:00 2001 From: Andrii Lytovchenko Date: Sun, 17 Oct 2021 16:33:38 +0200 Subject: [PATCH 5/6] Update deployment.yml --- .github/workflows/deployment.yml | 34 ++++---------------------------- 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index efc884785..34f34e5de 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -5,27 +5,11 @@ on: tags: - v1r0p[0-9]+ pull_request: - # workflow_dispatch: - # inputs: - # tag: - # description: 'Old style tag name, e.g.: v4r3p5' - # required: true - # deploy_github: - # description: 'Create PEP-440 styled tag release in GitHub' - # required: false - # default: false - # deploy_pypi: - # description: 'Create PEP-440 styled tag release in PyPI' - # required: false - # default: false jobs: deploy-pypi: name: PyPI deployment runs-on: "ubuntu-latest" - #outputs: - # tag_name: ${{ steps.PEP-440.outputs.tag_name }} - # target_commitish: ${{ steps.PEP-440.outputs.target_commitish }} if: github.event_name != 'push' || github.repository == 'TaykYoku/WebAppDIRAC' steps: @@ -46,28 +30,18 @@ jobs: TAG_NAME=v1r0p4 NEW_STYLE=$(python -c "import diraccfg; major, minor, patch, pre = diraccfg.parseVersion('${TAG_NAME}'); print(f'{major}.{minor}.{patch}', f'a{pre}' if pre else '', sep='')") echo "Converted ${TAG_NAME} version to ${NEW_STYLE}" - cat release.notes echo ::set-output name=tag_name::"v$NEW_STYLE" echo ::set-output name=target_commitish::"$(git rev-parse HEAD)" - - #create-pep440-release: - # name: PEP-440 release deployment - # runs-on: "ubuntu-latest" - # needs: deploy-pypi - # steps: + - run: echo ${{ steps.PEP-440.outputs.tag_name }} + - run: echo ${{ steps.PEP-440.outputs.target_commitish }} - name: Publish ${{ steps.PEP-440.outputs.tag_name }} release to GitHub - # if: github.event_name == 'push' || ${{ inputs.deploy_github }} + # if: github.event_name == 'push' uses: softprops/action-gh-release@v1 with: target_commitish: ${{ steps.PEP-440.outputs.target_commitish }} body_path: release.notes tag_name: ${{ steps.PEP-440.outputs.tag_name }} - #create-pypi-release: - # name: PyPI release deployment - # runs-on: "ubuntu-latest" - # needs: [deploy-pypi, create-pep440-release] - # steps: - name: Get ${{ steps.PEP-440.outputs.tag_name }} tag uses: actions/checkout@v2 with: @@ -75,7 +49,7 @@ jobs: - name: Build distributions run: python -m build - name: Publish package on PyPI - # if: github.event_name == 'push' || ${{ inputs.deploy_pypi }} + # if: github.event_name == 'push' run: ls dist/ # uses: pypa/gh-action-pypi-publish@master # with: From 934308378a7fb846bfda71390398e3b3036ce331 Mon Sep 17 00:00:00 2001 From: Andrii Lytovchenko Date: Sun, 17 Oct 2021 16:51:25 +0200 Subject: [PATCH 6/6] Update deployment.yml --- .github/workflows/deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 34f34e5de..a06a48b90 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -27,6 +27,7 @@ jobs: id: PEP-440 # if: github.event_name == 'push' run: | + echo "git ref: ${GITHUB_REF##*/}" TAG_NAME=v1r0p4 NEW_STYLE=$(python -c "import diraccfg; major, minor, patch, pre = diraccfg.parseVersion('${TAG_NAME}'); print(f'{major}.{minor}.{patch}', f'a{pre}' if pre else '', sep='')") echo "Converted ${TAG_NAME} version to ${NEW_STYLE}"