From cb250b1293bccfc30cb82b999889fbb018f44dde Mon Sep 17 00:00:00 2001 From: GuillaumeFalourd Date: Thu, 21 Oct 2021 15:03:39 -0300 Subject: [PATCH] update action.yml Signed-off-by: GuillaumeFalourd --- .github/workflows/ubuntu_action_test.yml | 4 ++-- action.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ubuntu_action_test.yml b/.github/workflows/ubuntu_action_test.yml index 1301863..c2cdfe5 100644 --- a/.github/workflows/ubuntu_action_test.yml +++ b/.github/workflows/ubuntu_action_test.yml @@ -7,14 +7,14 @@ on: workflow_dispatch: jobs: - minimal: + ubuntu-minimal: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.3.4 - run: date > reports/ubuntu_report_1.txt - uses: GuillaumeFalourd/git-commit-push@main - full: + ubuntu-full: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2.3.4 diff --git a/action.yml b/action.yml index 7cdc718..c20188c 100644 --- a/action.yml +++ b/action.yml @@ -83,11 +83,11 @@ runs: git add ${{ inputs.files }} -v git commit -m "${{ inputs.commit_message }}" $EMPTY - git branch push-and-commit-action-${{ github.run_id }} + git branch push-and-commit-action-${{ github.run_id }}-${{ github.job }} git fetch "${{ inputs.remote_repository }}" "$CURRENT_BRANCH" git checkout "$CURRENT_BRANCH" - git merge push-and-commit-action-${{ github.run_id }} - git branch -d push-and-commit-action-${{ github.run_id }} + git merge push-and-commit-action-${{ github.run_id }}-${{ github.job }} + git branch -d push-and-commit-action-${{ github.run_id }}-${{ github.job }} git push "${{ inputs.remote_repository }}" "$CURRENT_BRANCH:$TARGET_BRANCH" --follow-tags $FORCE $TAGS shell: bash