add more debug data to changelog workflow, update changelog

.github/workflows/changelog.yaml

@@ -56,7 +56,7 @@ jobs:
 
           if [[ "$(git rev-parse "origin/$BRANCH")" != $GITHUB_SHA ]]; then
             # Normal build on a branch (no tag)
-            echo "::debug::BRANCH: $BRANCH"
+            echo "::debug::BRANCH: $BRANCH $(git rev-parse origin/$BRANCH)"
             echo "::debug::GITHUB_SHA: $GITHUB_SHA"
             echo "::error::$BRANCH has been updated since build started. Aborting changelog."
             exit 1
@@ -130,7 +130,7 @@ jobs:
           echo "SOMETHING_CHANGED=$SOMETHING_CHANGED" >> $GITHUB_ENV
 
       - name: Commit
-        if: env.SOMETHING_CHANGED
+        if: env.SOMETHING_CHANGED == 'true'
         run: |
           git config user.email "jrnl.bot@gmail.com"
           git config user.name "Jrnl Bot"

.github/workflows/release.yaml

@@ -75,6 +75,7 @@ jobs:
         git add pyproject.toml jrnl/__version__.py
         git commit -m "Increment version to ${JRNL_VERSION}"
         git tag -a -m "$JRNL_VERSION" "$JRNL_VERSION"
+        git push
         git push --tags
 
     - name: Build
@@ -170,18 +171,31 @@ jobs:
         command: |
           curl -Ls https://pypi.org/pypi/jrnl/json > api_response.json
           # if query doesn't have our version yet, give it some time before trying again
-          [[ "null" == "$(jq ".releases[\"${PYPI_VERSION}\"][1].url" -r api_response.json)" ]] && exit 1
+          if [[ "null" == "$(jq ".releases[\"${PYPI_VERSION}\"][1].url" -r api_response.json)" ]]; then
+            echo "::debug::PYPI_VERSION: $PYPI_VERSION"
+            echo "::debug::JQ VALUE: $(jq ".releases[\"${PYPI_VERSION}\"][1].url" -r api_response.json)"
+            echo "::group::cat api_response.json"
+            cat api_response.json
+            echo "::endgroup::"
+            exit 1
+          fi
 
     - name: Update Homebrew Formula
-      run: >
-        brew bump-formula-pr "Formula/${FORMULA_NAME}.rb"
-        --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
-        --no-audit
-        --write
-        --commit
-        --force
+      uses: nick-invision/retry@v2
+      with:
+        timeout_minutes: 8
+        max_attempts: 6
+        retry_wait_seconds: 30
+        command: >
+          brew bump-formula-pr "Formula/${FORMULA_NAME}.rb"
+          --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
+          --no-audit
+          --write
+          --commit
+          --force
+          --verbose
 
     - name: Update commit message
       run: |

CHANGELOG.md

@@ -1,8 +1,8 @@
 # Changelog
 
-## [Unreleased](https://github.com/jrnl-org/jrnl/)
+## [v2.6-beta3](https://pypi.org/project/jrnl/v2.6-beta3/) (2020-12-19)
 
-[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.6-beta...HEAD)
+[Full Changelog](https://github.com/jrnl-org/jrnl/compare/v2.6-beta...v2.6-beta3)
 
 **Fixed bugs:**