From 06e5b4baf61ab4bc2799608a0e419a53cd01e6ea Mon Sep 17 00:00:00 2001 From: Micah Jerome Ellison Date: Sat, 6 Mar 2021 13:47:11 -0800 Subject: [PATCH] Fix broken brew release process (#1211) * Add homebrew symlink for releases * Fix indentation problem * Fix bad env var name * Change filename to formula name * Fix formula name * Attempt tap instead of symlink * Fix formula repo referece * add tracer * Attempt working directory fix * Remove --unshallow * Use token for remote * Move set tap directory step * Remove tracer * Clean up spacing and wrap quotes to tap directory --- .github/workflows/release.yaml | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3d57918a..7b4dfb18 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -116,7 +116,6 @@ jobs: HOMEBREW_NO_INSTALL_CLEANUP: 1 HOME_REPO: ${{ secrets.HOME_REPO }} steps: - - name: Get version run: | JRNL_VERSION="${{ github.event.inputs.version }}" @@ -153,23 +152,26 @@ jobs: } >> $GITHUB_ENV fi - - name: Checkout homebrew repo - uses: actions/checkout@v2 - with: - token: ${{ secrets.JRNL_BOT_TOKEN }} - repository: ${{ env.FORMULA_REPO }} + - name: Tap formula + run: | + brew tap ${FORMULA_REPO} + echo '::debug::Set tap directory' + echo "BREW_TAP_DIRECTORY='$(brew --repository)/Library/Taps/${FORMULA_REPO}'" >> $GITHUB_ENV - name: Config git user + working-directory: ${{ env.BREW_TAP_DIRECTORY }} run: | git config --global user.name "${{ secrets.JRNL_BOT_NAME }}" git config --global user.email "${{ secrets.JRNL_BOT_EMAIL }}" - name: Create branch + working-directory: ${{ env.BREW_TAP_DIRECTORY }} run: | BRANCH_NAME="jrnl-${JRNL_VERSION}--${RANDOM}" git remote rename origin upstream - git remote add origin "https://github.com/${BOT_REPO}.git" - git fetch --unshallow upstream + git remote add origin "https://${{ secrets.JRNL_BOT_NAME }}:${{ secrets.JRNL_BOT_TOKEN }}@github.com/${BOT_REPO}.git" + + git fetch upstream git fetch origin git checkout -b $BRANCH_NAME git push -u origin $BRANCH_NAME @@ -202,7 +204,7 @@ jobs: max_attempts: 6 retry_wait_seconds: 30 command: > - brew bump-formula-pr "Formula/${FORMULA_NAME}.rb" + brew bump-formula-pr "${FORMULA_NAME}" --url $(jq ".releases[\"${PYPI_VERSION}\"][1].url" -r api_response.json) --sha256 $(jq ".releases[\"${PYPI_VERSION}\"][1].digests.sha256" -r api_response.json) --version=$PYPI_VERSION @@ -213,6 +215,7 @@ jobs: --verbose - name: Update commit message + working-directory: ${{ env.BREW_TAP_DIRECTORY }} run: | git commit --amend \ -m "jrnl ${JRNL_VERSION}" \ @@ -220,11 +223,13 @@ jobs: -m '${{ secrets.RELEASE_COAUTHORS }}' - name: Push commit + working-directory: ${{ env.BREW_TAP_DIRECTORY }} run: | git show head git push - name: Open pull request + working-directory: ${{ env.BREW_TAP_DIRECTORY }} env: GH_TOKEN: ${{ secrets.JRNL_BOT_TOKEN }} run: >