diff --git a/.github/workflows/chatgpt.yaml b/.github/workflows/chatgpt similarity index 100% rename from .github/workflows/chatgpt.yaml rename to .github/workflows/chatgpt diff --git a/.github/workflows/merge-forward b/.github/workflows/merge-forward deleted file mode 100644 index 957f5ab..0000000 --- a/.github/workflows/merge-forward +++ /dev/null @@ -1,40 +0,0 @@ -name: Release Workflow - -on: - push: - branches: - - release/* - -jobs: - merge_commit: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Set up Git - run: | - git config --global user.email "mbuchoff@gmail.com" - git config --global user.name "DevOps ${{ github.workflow }}" - - - name: Read release branch from file - id: read_branch - run: | - RELEASE_BRANCH=$(cat release_branch.txt) - echo "::set-output name=branch::${RELEASE_BRANCH}" - - - name: Merge and push - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - set -e -v - - gitcommit=$(git rev-parse HEAD) - git checkout ${{ steps.read_branch.outputs.branch }} - - git merge $gitcommit --no-ff - - git remote set-url origin https://x-access-token:${GITHUB_TOKEN}@github.com/mbuchoff/automerge.git - git push origin diff --git a/.github/workflows/merge-forward.yaml b/.github/workflows/merge-forward.yaml index 957f5ab..d730637 100644 --- a/.github/workflows/merge-forward.yaml +++ b/.github/workflows/merge-forward.yaml @@ -1,4 +1,4 @@ -name: Release Workflow +name: Release Workflow 2 on: push: diff --git a/devops_description 2.txt b/devops_description 2.txt index 05a682b..d4b3097 100644 --- a/devops_description 2.txt +++ b/devops_description 2.txt @@ -1 +1,3 @@ -Hello! \ No newline at end of file +Hello! + +World. \ No newline at end of file