fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-10 16:48:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add more debug data to changelog workflow, update changelog

Browse source
This commit is contained in:
Jonathan Wren 2020-12-19 16:56:23 -08:00
parent 6dbe2a1df4
commit 07c9a43570
No known key found for this signature in database
GPG key ID: 43D5FF8722E7F68A
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/changelog.yaml vendored
View file

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

10
.github/workflows/release.yaml vendored
View file

@ -75,6 +75,7 @@ jobs:
git add pyproject.toml jrnl/__version__.py git add pyproject.toml jrnl/__version__.py
git commit -m "Increment version to ${JRNL_VERSION}" git commit -m "Increment version to ${JRNL_VERSION}"
git tag -a -m "$JRNL_VERSION" "$JRNL_VERSION" git tag -a -m "$JRNL_VERSION" "$JRNL_VERSION"
git push
git push --tags git push --tags
- name: Build - name: Build
@ -170,7 +171,14 @@ jobs:
command: | command: |
curl -Ls https://pypi.org/pypi/jrnl/json > api_response.json 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 # 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 - name: Update Homebrew Formula
run: > run: >

4
CHANGELOG.md
View file

@ -1,8 +1,8 @@
# Changelog # 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:** **Fixed bugs:**