diff --git a/.github/workflow-config/release.yml b/.github/workflow-config/release.yml index 1b75a7f5d..b0892d43c 100644 --- a/.github/workflow-config/release.yml +++ b/.github/workflow-config/release.yml @@ -48,7 +48,7 @@ - name: push changelogs to devel shell: - cmd: "git checkout devel && git add changelogs CHANGELOG.rst && git commit -m 'add changelog {{ collection_version }}' && git push" + cmd: "git add changelogs CHANGELOG.rst && git commit -m 'add changelog {{ collection_version }}'" chdir: "{{ repo_base_dir }}" - name: git cleanup diff --git a/.github/workflows/galaxy-release.yml b/.github/workflows/galaxy-release.yml index 8d8099f29..f1f6c08d7 100644 --- a/.github/workflows/galaxy-release.yml +++ b/.github/workflows/galaxy-release.yml @@ -14,7 +14,8 @@ jobs: - name: Check out code uses: actions/checkout@v1 with: - token: ${{ secrets.GITHUB_TOKEN }} + persist-credentials: false + fetch-depth: 0 - name: Set up Python 3.8 uses: actions/setup-python@v1 @@ -31,3 +32,9 @@ jobs: -e api_key=${{ secrets.ANSIBLE_GALAXY_APIKEY }} -e collection_repo=https://github.com/${{ github.repository }} --skip-tags=install,cleanup + + - name: Push changes + uses: ad-m/github-push-action@master + with: + branch: devel + github_token: ${{ secrets.GITHUB_TOKEN }}