Skip to content

Commit

Permalink
Merge pull request #199 from anothrNick/hotfix/sorttags
Browse files Browse the repository at this point in the history
Hotfix: sort output tag mismatch reverting breaking change
  • Loading branch information
sbe-arg authored Oct 4, 2022
2 parents de8337c + b3501df commit 1ffbb2e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ on:

jobs:
build:
if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
with:
ref: master
fetch-depth: '0'
ref: ${{ github.ref_name }}

- name: version-tag
id: tag
Expand All @@ -23,13 +24,14 @@ jobs:
VERBOSE: true
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# auto releases is not working atm and is deleting releases due branch tags
- name: automatic-draft-release
uses: marvinpinto/action-automatic-releases@v1.2.1
with:
draft: true
repo_token: ${{ secrets.GITHUB_TOKEN }}
title: "${{ steps.tag.outputs.tag }}: [title-edit-me] by:${{ github.actor }}"
automatic_release_tag: ${{ steps.tag.outputs.tag }}
automatic_release_tag: ${{ steps.tag.outputs.new_tag }}

- name: version-tag-major
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ jobs:
shell: bash
run: |
set -x
MAIN_OUTPUT_TAG=${{ steps.test_main.outputs.tag }}
MAIN_OUTPUT_TAG=${{ steps.test_main.outputs.old_tag }}
MAIN_OUTPUT_NEWTAG=${{ steps.test_main.outputs.new_tag }}
MAIN_OUTPUT_PART=${{ steps.test_main.outputs.part }}
PRE_OUTPUT_TAG=${{ steps.test_pre.outputs.tag }}
PRE_OUTPUT_TAG=${{ steps.test_pre.outputs.old_tag }}
PRE_OUTPUT_NEWTAG=${{ steps.test_pre.outputs.new_tag }}
PRE_OUTPUT_PART=${{ steps.test_pre.outputs.part }}
Expand Down
3 changes: 2 additions & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ fi
# set outputs
echo "::set-output name=new_tag::$new"
echo "::set-output name=part::$part"
echo "::set-output name=tag::$tag"
echo "::set-output name=tag::$new" # this needs to go in v2 is breaking change
echo "::set-output name=old_tag::$tag"

# dry run exit without real changes
if $dryrun
Expand Down

0 comments on commit 1ffbb2e

Please sign in to comment.