Skip to content

Commit

Permalink
Rebase on top of v3.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
eliaskosunen committed Nov 3, 2024
1 parent 4a47bea commit d2807c0
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 15 deletions.
14 changes: 1 addition & 13 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,24 +61,12 @@ jobs:
cd docs
poxy --verbose --git-tags --min-version v2.0.0 --no-squash-patches
- name: Deploy (master)
- name: Deploy
uses: peaceiris/actions-gh-pages@v3
if: ${{ github.ref_name == 'master' || github.event_name == 'release' }}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs/html
keep_files: true
user_name: 'github-actions[bot]'
user_email: 'github-actions[bot]@users.noreply.github.com'
commit_message: Update documentation (GitHub actions deploy)

- name: Deploy (branch)
uses: peaceiris/actions-gh-pages@v3
if: ${{ github.ref_name != 'master' && github.event_name != 'release' }}
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs/html
destination_dir: ref/${{ github.ref_name }}
user_name: 'github-actions[bot]'
user_email: 'github-actions[bot]@users.noreply.github.com'
commit_message: Update documentation (GitHub actions deploy)
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,20 @@ return result;
### Changes
* `visit_scan_arg` deprecated, `basic_scan_arg::visit` added
* Deprecate `visit_scan_arg`, add `basic_scan_arg::visit`
* Remove thousands separator checking when scanning localized numbers
## 3.0.2
_Released 2024-xx-xx_
_Released 2024-11-03_
* Fix formatting options of user-defined types sometimes being ignored
* Fix unnecessary blocking in `scn::input`
* Fix usage of `std::regex_constants::multiline` on libstdc++ v11 (#130, thanks [@jiayuehua (Jia Yue Hua)](https://github.com/jiayuehua))
* Fix build failures on Emscripten
* Update documentation to have a version-dropdown
* Fix typo in documentation about manual indexing (#122, thanks [@lynxlynxlynx (Jaka Kranjc)](https://github.com/lynxlynxlynx))
* Fix typos in README (#120, thanks [@zencatalyst (Kasra Hashemi)](https://github.com/zencatalyst))
## 3.0.1
Expand Down
1 change: 1 addition & 0 deletions docs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ add_custom_command(
"${CMAKE_CURRENT_LIST_DIR}/pages/guide.md"
"${CMAKE_CURRENT_LIST_DIR}/pages/mainpage.md"
"${CMAKE_CURRENT_LIST_DIR}/../CHANGELOG.md"
"${CMAKE_CURRENT_LIST_DIR}/script/monospace-headers.js"
"${SCN_ABSOLUTE_PUBLIC_HEADERS}"
COMMENT "Generating docs"
VERBATIM)
Expand Down

0 comments on commit d2807c0

Please sign in to comment.