diff --git a/.circleci/config.yml b/.circleci/config.yml index 464698be..c37bba58 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -51,6 +51,8 @@ jobs: build: executor: rails_executor + environment: + PARALLEL_WORKERS: "1" steps: - checkout - setup_bundler diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ed6778fd..8622ed95 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,9 +15,17 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + with: + ref: main + fetch-depth: 0 - name: Update release branch run: | + git config user.name 'GH Actions Bot' + git config user.email 'actions.bot@example.com' + + git fetch origin main + git fetch origin release git checkout release git pull git merge main -m '${{ inputs.message }}'