Skip to content

Commit

Permalink
MP1-5187: Bump NSIS 3.08 to 3.09 (#236)
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewjswan authored Dec 13, 2023
1 parent 02613ec commit 20deafe
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/mediaportal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

- name: Setup NSIS
run: |
choco install --yes nsis --version=3.08 --force
choco install --yes nsis --version=3.09 --force
- name: Git Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mediaportal_jira.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

- name: Setup NSIS
run: |
choco install --yes nsis --version=3.08 --force
choco install --yes nsis --version=3.09 --force
- name: Git Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mediaportal_test_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

- name: Setup NSIS
run: |
choco install --yes nsis --version=3.08 --force
choco install --yes nsis --version=3.09 --force
- name: Git Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow_codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

- name: Setup NSIS
run: |
choco install --yes nsis --version=3.08 --force
choco install --yes nsis --version=3.09 --force
- name: Git Checkout
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions Tools/InstallationScripts/include/MediaPortalMacros.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
*/
#endregion

!if "${NSIS_VERSION}" != "v3.08"
!error "$\r$\n$\r$\nUnsupported NSIS version: ${NSIS_VERSION}. Please use NSIS v3.08, http://nsis.sourceforge.net$\r$\n$\r$\n"
!if "${NSIS_VERSION}" != "v3.09"
!error "$\r$\n$\r$\nUnsupported NSIS version: ${NSIS_VERSION}. Please use NSIS v3.09, http://nsis.sourceforge.net$\r$\n$\r$\n"
!endif

!ifndef ___COMMON_MP_MACROS__NSH___
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ install:
- cmd: >-
git submodule update --init --recursive
choco install nsis --version=3.08
choco install nsis --version=3.09
java -version
Expand Down

0 comments on commit 20deafe

Please sign in to comment.