Skip to content

Commit

Permalink
Merge pull request #372 from jmuelbert/dependabot/github_actions/ilam…
Browse files Browse the repository at this point in the history
…my/msvc-dev-cmd-1.10.0
  • Loading branch information
jmuelbert authored Oct 9, 2021
2 parents 344ddb1 + 72d0fe9 commit 87f22c6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
# Windows
- name: Install MSVC compiler for ${{ runner.os }}
if: runner.os == 'Windows'
uses: ilammy/msvc-dev-cmd@v1.9.0
uses: ilammy/msvc-dev-cmd@v1.10.0
with:
# 14.1 is for vs2017, 14.2 is vs2019, following the upstream vcpkg build from repo
toolset: 14.2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-pack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
echo "VERSION=$(cat CMakeLists.txt |grep 'set.*(.*jmbde_VERSION' | sed 's/[^0-9.]*//' |sed 's/)//g')" >> $GITHUB_ENV
- name: Install MSVC compiler
uses: ilammy/msvc-dev-cmd@v1.9.0
uses: ilammy/msvc-dev-cmd@v1.10.0
with:
# 14.1 is for vs2017, 14.2 is vs2019, following the upstream vcpkg build from Qv2ray-deps repo
toolset: 14.2
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## [master](https://github.com/jmuelbert/jmbde-QT/tree/master) (2021-08-14)
## [Unreleased](https://github.com/jmuelbert/jmbde-QT/tree/HEAD)

**Implemented enhancements:**

Expand Down Expand Up @@ -77,6 +77,7 @@
- Bump sphinx from 3.3.1 to 3.4.0 [\#164](https://github.com/jmuelbert/jmbde-QT/pull/164)
- Bump requests from 2.25.0 to 2.25.1 [\#163](https://github.com/jmuelbert/jmbde-QT/pull/163)
- Bump breathe from 4.24.1 to 4.25.1 [\#162](https://github.com/jmuelbert/jmbde-QT/pull/162)
- Fix typos by misspell-fixer for refs/heads/master [\#146](https://github.com/jmuelbert/jmbde-QT/pull/146)
- Format codes for refs/heads/dependabot/github\_actions/peter-evans/create-pull-request-v3.5.2 [\#145](https://github.com/jmuelbert/jmbde-QT/pull/145)
- Fix typos by misspell-fixer for refs/heads/dependabot/github\_actions/peter-evans/create-pull-request-v3.5.2 [\#144](https://github.com/jmuelbert/jmbde-QT/pull/144)
- Fix typos by misspell-fixer for refs/heads/dependabot/github\_actions/actions/cache-v2.1.3 [\#143](https://github.com/jmuelbert/jmbde-QT/pull/143)
Expand Down

0 comments on commit 87f22c6

Please sign in to comment.